[Glibc-bsd-commits] r5019 - in trunk/ufsutils/debian: . patches
Guillem Jover
guillem at alioth.debian.org
Wed Oct 9 05:53:02 UTC 2013
Author: guillem
Date: 2013-10-09 05:53:02 +0000 (Wed, 09 Oct 2013)
New Revision: 5019
Modified:
trunk/ufsutils/debian/changelog
trunk/ufsutils/debian/control
trunk/ufsutils/debian/patches/00_include.patch
trunk/ufsutils/debian/patches/01_libufs.patch
trunk/ufsutils/debian/patches/02_badsect.ufs.patch
trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
trunk/ufsutils/debian/patches/02_ffsinfo.patch
trunk/ufsutils/debian/patches/02_fsck.ufs.patch
trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
trunk/ufsutils/debian/patches/99_makefiles.patch
trunk/ufsutils/debian/rules
Log:
Switch to the libbsd-overlay
Remove sys/endian.h local header now provided by libbsd.
Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/changelog 2013-10-09 05:53:02 UTC (rev 5019)
@@ -10,6 +10,8 @@
* Now using Standards-Version 3.9.3.
* Switch to canonical Vcs URLs.
* Remove packaging history from debian/copyright.
+ * Switch to the libbsd-overlay.
+ - Remove sys/endian.h local header now provided by libbsd.
-- Robert Millan <rmh at debian.org> Thu, 08 Dec 2011 13:40:32 +0100
Modified: trunk/ufsutils/debian/control
===================================================================
--- trunk/ufsutils/debian/control 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/control 2013-10-09 05:53:02 UTC (rev 5019)
@@ -3,7 +3,9 @@
Priority: optional
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>, Robert Millan <rmh at debian.org>
-Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), libbsd-dev, libedit-dev,
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), pkg-config,
+ libbsd-dev (>= 0.4.0),
+ libedit-dev,
libc0.1-dev (>= 2.10.1) [kfreebsd-any]
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/ufsutils/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/ufsutils/
Modified: trunk/ufsutils/debian/patches/00_include.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_include.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/00_include.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -1,8 +1,7 @@
---
- sys/sys/disklabel.h | 3 -
- sys/sys/endian.h | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- sys/sys/ucred.h | 2
- 3 files changed, 146 insertions(+), 1 deletion(-)
+ sys/sys/disklabel.h | 3 ++-
+ sys/sys/ucred.h | 2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -28,148 +27,3 @@
/*
* Credentials.
---- /dev/null
-+++ b/sys/sys/endian.h
-@@ -0,0 +1,142 @@
-+/*-
-+ * Copyright (c) 2002 Thomas Moestl <tmm at FreeBSD.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ * $FreeBSD$
-+ */
-+
-+#ifndef _SYS_ENDIAN_H_
-+#define _SYS_ENDIAN_H_
-+
-+#include <endian.h>
-+
-+/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
-+
-+static __inline uint16_t
-+be16dec(const void *pp)
-+{
-+ uint8_t const *p = (uint8_t const *)pp;
-+
-+ return ((p[0] << 8) | p[1]);
-+}
-+
-+static __inline uint32_t
-+be32dec(const void *pp)
-+{
-+ uint8_t const *p = (uint8_t const *)pp;
-+
-+ return (((unsigned)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
-+}
-+
-+static __inline uint64_t
-+be64dec(const void *pp)
-+{
-+ uint8_t const *p = (uint8_t const *)pp;
-+
-+ return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4));
-+}
-+
-+static __inline uint16_t
-+le16dec(const void *pp)
-+{
-+ uint8_t const *p = (uint8_t const *)pp;
-+
-+ return ((p[1] << 8) | p[0]);
-+}
-+
-+static __inline uint32_t
-+le32dec(const void *pp)
-+{
-+ uint8_t const *p = (uint8_t const *)pp;
-+
-+ return (((unsigned)p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
-+}
-+
-+static __inline uint64_t
-+le64dec(const void *pp)
-+{
-+ uint8_t const *p = (uint8_t const *)pp;
-+
-+ return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p));
-+}
-+
-+static __inline void
-+be16enc(void *pp, uint16_t u)
-+{
-+ uint8_t *p = (uint8_t *)pp;
-+
-+ p[0] = (u >> 8) & 0xff;
-+ p[1] = u & 0xff;
-+}
-+
-+static __inline void
-+be32enc(void *pp, uint32_t u)
-+{
-+ uint8_t *p = (uint8_t *)pp;
-+
-+ p[0] = (u >> 24) & 0xff;
-+ p[1] = (u >> 16) & 0xff;
-+ p[2] = (u >> 8) & 0xff;
-+ p[3] = u & 0xff;
-+}
-+
-+static __inline void
-+be64enc(void *pp, uint64_t u)
-+{
-+ uint8_t *p = (uint8_t *)pp;
-+
-+ be32enc(p, (uint32_t)(u >> 32));
-+ be32enc(p + 4, (uint32_t)(u & 0xffffffffU));
-+}
-+
-+static __inline void
-+le16enc(void *pp, uint16_t u)
-+{
-+ uint8_t *p = (uint8_t *)pp;
-+
-+ p[0] = u & 0xff;
-+ p[1] = (u >> 8) & 0xff;
-+}
-+
-+static __inline void
-+le32enc(void *pp, uint32_t u)
-+{
-+ uint8_t *p = (uint8_t *)pp;
-+
-+ p[0] = u & 0xff;
-+ p[1] = (u >> 8) & 0xff;
-+ p[2] = (u >> 16) & 0xff;
-+ p[3] = (u >> 24) & 0xff;
-+}
-+
-+static __inline void
-+le64enc(void *pp, uint64_t u)
-+{
-+ uint8_t *p = (uint8_t *)pp;
-+
-+ le32enc(p, (uint32_t)(u & 0xffffffffU));
-+ le32enc(p + 4, (uint32_t)(u >> 32));
-+}
-+
-+#endif /* _SYS_ENDIAN_H_ */
Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/01_libufs.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -74,7 +74,7 @@
* practice this seems unlikely. So, we define the type doff_t as a 32-bit
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
-@@ -1,27 +1,17 @@
+@@ -1,27 +1,16 @@
# $FreeBSD$
LIB= ufs
@@ -99,7 +99,6 @@
+ifdef LIBUFS_DEBUG
+ALL_CFLAGS+= -D_LIBUFS_DEBUGGING
+endif
-+LDADD += -lbsd
+INCLUDES = -I.
-WARNS?= 2
Modified: trunk/ufsutils/debian/patches/02_badsect.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_badsect.ufs.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/02_badsect.ufs.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -18,7 +18,7 @@
+MAN = badsect.8:badsect.ufs.8
+
+INCLUDES = -I../../lib/libufs
-+LDADD += -L../../lib/libufs -lufs -lbsd
++LDADD += -L../../lib/libufs -lufs
+
+include ../../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -28,7 +28,7 @@
+WARNS = 0
+MAN = dumpfs.8:dumpfs.ufs.8
+
-+LDADD += -L../../lib/libufs/ -lufs -lbsd
++LDADD += -L../../lib/libufs/ -lufs
+INCLUDES = -I../../lib/libufs
+
+include ../../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_ffsinfo.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_ffsinfo.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/02_ffsinfo.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -18,7 +18,7 @@
-SRCS= ffsinfo.c debug.c
-MAN= ffsinfo.8
+ALL_CFLAGS = -DFS_DEBUG -I../growfs -I../../lib/libufs
-+LDADD += -L../../lib/libufs -lufs -lbsd
++LDADD += -L../../lib/libufs -lufs
+
+include ../../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -518,7 +518,7 @@
+ ../mount/getmntopts.c
-.PATH: ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../mount
-+LDADD += -L../../lib/port -lport -L. -l$(LIB) -L../../lib/libufs -lufs -lbsd
++LDADD += -L../../lib/port -lport -L. -l$(LIB) -L../../lib/libufs -lufs
+INCLUDES = -I. -I../../lib/libufs -I../mount
+
+include ../../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsdb.ufs.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/02_fsdb.ufs.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -101,7 +101,7 @@
+MAN = fsdb.8:fsdb.ufs.8
+SRCS = fsdb.c fsdbutil.c
+WARNS = 0
-+LDADD += -ledit -L../../lib/libufs -lufs -L../fsck_ffs -lfsck.ufs -lbsd
++LDADD += -ledit -L../../lib/libufs -lufs -L../fsck_ffs -lfsck.ufs
+DPADD += ${LIBEDIT}
+INCLUDES = -I../fsck_ffs
Modified: trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_mkfs.ufs.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/02_mkfs.ufs.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -115,7 +115,7 @@
-MAN= newfs.8
+MAN= newfs.8:mkfs.ufs.8
+
-+LDADD += -L../../lib/libufs -lufs -L../../lib/port -lport -lbsd
++LDADD += -L../../lib/libufs -lufs -L../../lib/port -lport
+INCLUDES = -I../../lib/libufs -include ../../lib/port/blockdev.h
-.include <bsd.prog.mk>
Modified: trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_tunefs.ufs.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/02_tunefs.ufs.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -76,7 +76,7 @@
+SRCS = tunefs.c
+MAN = tunefs.8:tunefs.ufs.8
+
-+LDADD += -L../../lib/libufs -lufs -lbsd
++LDADD += -L../../lib/libufs -lufs
+INCLUDES = -I../../lib/libufs
+
+include ../../Makefile.common
Modified: trunk/ufsutils/debian/patches/99_makefiles.patch
===================================================================
--- trunk/ufsutils/debian/patches/99_makefiles.patch 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/patches/99_makefiles.patch 2013-10-09 05:53:02 UTC (rev 5019)
@@ -35,7 +35,7 @@
+.PHONY: all clean install $(SUBDIRS) $(clean_targets) $(install_targets)
--- /dev/null
+++ b/Makefile.common
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,90 @@
+#
+# $Id: Makefile.common 45 2004-05-03 11:07:29Z guillem $
+#
@@ -48,9 +48,8 @@
+mandir = $(datadir)/man
+man8dir = $(mandir)/man8
+
-+#LDADD += -lbsd
+CFLAGS ?= -Wall -g -O2
-+ALL_CFLAGS += -I../../sys -I../../lib/port -include port.h -include bsd/bsd.h -D_GNU_SOURCE
++ALL_CFLAGS += -I../../sys -I../../lib/port -include port.h -D_GNU_SOURCE
+# -DHAVE_BSD_ERRNO -DHAVE_BSD_SIGNALS -DHAVE_BSD_STATFS -DHAVE_BSD_DISKLABEL -DHAVE_BSD_MOUNT -DHAVE_UFS_SNAPSHOT -DHAVE_BSD_SYSCTL
+
+INSTALL = install
Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules 2013-10-09 05:52:57 UTC (rev 5018)
+++ trunk/ufsutils/debian/rules 2013-10-09 05:53:02 UTC (rev 5019)
@@ -10,9 +10,12 @@
DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS := -Wall \
+ $(shell dpkg-buildflags --get CFLAGS) \
+ $(shell pkg-config --cflags libbsd-overlay)
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) \
+ $(shell pkg-config --libs libbsd-overlay)
# GNU/kFreeBSD already have off_t 64bit. It must not be enabled,
# as it would change size of ino_t
More information about the Glibc-bsd-commits
mailing list