[Glibc-bsd-commits] r4441 - in trunk/freebsd-quota/debian: . patches
Guillem Jover
guillem at alioth.debian.org
Fri May 17 19:01:39 UTC 2013
Author: guillem
Date: 2013-05-17 19:01:39 +0000 (Fri, 17 May 2013)
New Revision: 4441
Modified:
trunk/freebsd-quota/debian/changelog
trunk/freebsd-quota/debian/control
trunk/freebsd-quota/debian/patches/01_sbin_quotacheck.diff
trunk/freebsd-quota/debian/patches/03_usr_sbin_edquota.diff
trunk/freebsd-quota/debian/patches/04_usr_sbin_repquota.diff
trunk/freebsd-quota/debian/patches/07_cdevname.diff
trunk/freebsd-quota/debian/rules
Log:
Switch from patching the source to use the libbsd overlay
This fixes a FTBFS with newer libbsd that moved away libutil.h.
Modified: trunk/freebsd-quota/debian/changelog
===================================================================
--- trunk/freebsd-quota/debian/changelog 2013-05-17 15:11:14 UTC (rev 4440)
+++ trunk/freebsd-quota/debian/changelog 2013-05-17 19:01:39 UTC (rev 4441)
@@ -3,6 +3,8 @@
* Add missing freebsd-buildutils to Build-Depends.
* Replace portmap Suggests with rpcbind.
* Now using Standards-Version 3.9.4 (no changes needed).
+ * Switch from patching the source to use the libbsd overlay, this fixes
+ a FTBFS with newer libbsd that moved away libutil.h.
* Rename build target to build-arch to make it more accurate.
-- Guillem Jover <guillem at debian.org> Wed, 01 May 2013 16:42:02 +0200
Modified: trunk/freebsd-quota/debian/control
===================================================================
--- trunk/freebsd-quota/debian/control 2013-05-17 15:11:14 UTC (rev 4440)
+++ trunk/freebsd-quota/debian/control 2013-05-17 19:01:39 UTC (rev 4441)
@@ -4,8 +4,8 @@
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Mats Erik Andersson <mats.andersson at gisladisker.se>,
Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 8), freebsd-buildutils, libbsd-dev,
- libc0.1-dev (>= 2.10.1) [kfreebsd-any]
+Build-Depends: debhelper (>= 8), freebsd-buildutils, pkg-config,
+ libbsd-dev (>= 0.4.0), libc0.1-dev (>= 2.10.1) [kfreebsd-any]
Standards-Version: 3.9.4
Package: freebsd-quota
Modified: trunk/freebsd-quota/debian/patches/01_sbin_quotacheck.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/01_sbin_quotacheck.diff 2013-05-17 15:11:14 UTC (rev 4440)
+++ trunk/freebsd-quota/debian/patches/01_sbin_quotacheck.diff 2013-05-17 19:01:39 UTC (rev 4441)
@@ -6,44 +6,6 @@
Forwarded: not-needed
Last-Update: 2011-01-20
---- freebsd-8.1.orig/sbin/fsck/fsutil.c 2010-06-14 04:09:06.000000000 +0200
-+++ freebsd-8.1/sbin/fsck/fsutil.c 2011-01-20 19:30:59.000000000 +0100
-@@ -46,6 +46,7 @@
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <bsd/stdlib.h>
- #include <string.h>
-
- #include "fsutil.h"
-@@ -53,7 +54,8 @@
- static const char *dev = NULL;
- static int preen = 0;
-
--static void vmsg(int, const char *, va_list) __printflike(2, 0);
-+static void vmsg(int, const char *, va_list)
-+ __THROW __attribute__ ((__format__ (__printf__, 2, 0))) __wur;
-
- void
- setcdevname(const char *cd, int pr)
---- freebsd-8.1.orig/sbin/fsck/fsutil.h 2010-06-14 04:09:06.000000000 +0200
-+++ freebsd-8.1/sbin/fsck/fsutil.h 2011-01-20 19:28:09.000000000 +0100
-@@ -32,9 +32,12 @@
- */
-
- void perror(const char *);
--void pfatal(const char *, ...) __printflike(1, 2);
--void pwarn(const char *, ...) __printflike(1, 2);
--void panic(const char *, ...) __dead2 __printflike(1, 2);
-+void pfatal(const char *, ...)
-+ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
-+void pwarn(const char *, ...)
-+ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
-+void panic(const char *, ...) __attribute__ ((noreturn))
-+ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
- const char *devcheck(const char *);
- const char *cdevname(void);
- void setcdevname(const char *, int);
--- freebsd-8.1.orig/sbin/fsck_ffs/fsck.h 2010-06-14 04:09:06.000000000 +0200
+++ freebsd-8.1/sbin/fsck_ffs/fsck.h 2011-01-20 19:28:09.000000000 +0100
@@ -63,6 +63,7 @@
@@ -54,31 +16,6 @@
#define MAXDUP 10 /* limit on dup blks (per inode) */
#define MAXBAD 10 /* limit on bad blks (per inode) */
-@@ -372,7 +373,8 @@
- struct inostat *inoinfo(ino_t inum);
- int linkup(ino_t orphan, ino_t parentdir, char *name);
- int makeentry(ino_t parent, ino_t ino, const char *name);
--void panic(const char *fmt, ...) __printflike(1, 2);
-+void panic(const char *fmt, ...)
-+ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
- void pass1(void);
- void pass1b(void);
- int pass1check(struct inodesc *);
-@@ -381,10 +383,12 @@
- void pass4(void);
- int pass4check(struct inodesc *);
- void pass5(void);
--void pfatal(const char *fmt, ...) __printflike(1, 2);
-+void pfatal(const char *fmt, ...)
-+ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
- void pinode(ino_t ino);
- void propagate(void);
--void pwarn(const char *fmt, ...) __printflike(1, 2);
-+void pwarn(const char *fmt, ...)
-+ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
- int readsb(int listerr);
- int reply(const char *question);
- void rwerror(const char *mesg, ufs2_daddr_t blk);
--- freebsd-8.1.orig/sbin/fsck_ffs/fsutil.c 2010-06-14 04:09:06.000000000 +0200
+++ freebsd-8.1/sbin/fsck_ffs/fsutil.c 2011-01-20 19:28:09.000000000 +0100
@@ -59,6 +59,8 @@
Modified: trunk/freebsd-quota/debian/patches/03_usr_sbin_edquota.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/03_usr_sbin_edquota.diff 2013-05-17 15:11:14 UTC (rev 4440)
+++ trunk/freebsd-quota/debian/patches/03_usr_sbin_edquota.diff 2013-05-17 19:01:39 UTC (rev 4441)
@@ -6,16 +6,6 @@
Forwarded: not-needed
Last-Update: 2011-01-20
---- freebsd-8.1.orig/usr.sbin/edquota/edquota.c 2010-06-14 04:09:06.000000000 +0200
-+++ freebsd-8.1/usr.sbin/edquota/edquota.c 2011-01-20 19:28:30.000000000 +0100
-@@ -65,6 +65,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <bsd/string.h>
- #include <unistd.h>
- #include "pathnames.h"
-
diff -Naur freebsd-8.1.orig/usr.sbin/edquota/Makefile /tmp/freebsd-8.1/usr.sbin/edquota/Makefile
--- freebsd-8.1.orig/usr.sbin/edquota/Makefile 2010-06-14 04:09:06.000000000 +0200
+++ freebsd-8.1/usr.sbin/edquota/Makefile 2011-01-20 19:28:30.000000000 +0100
Modified: trunk/freebsd-quota/debian/patches/04_usr_sbin_repquota.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/04_usr_sbin_repquota.diff 2013-05-17 15:11:14 UTC (rev 4440)
+++ trunk/freebsd-quota/debian/patches/04_usr_sbin_repquota.diff 2013-05-17 19:01:39 UTC (rev 4441)
@@ -15,13 +15,3 @@
WARNS?= 4
.include <bsd.prog.mk>
---- freebsd-8.1.orig/usr.sbin/repquota/repquota.c 2010-06-14 04:09:06.000000000 +0200
-+++ freebsd-8.1/usr.sbin/repquota/repquota.c 2011-01-20 19:28:35.000000000 +0100
-@@ -58,6 +58,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <bsd/string.h>
- #include <time.h>
- #include <unistd.h>
- #include <utmp.h>
Modified: trunk/freebsd-quota/debian/patches/07_cdevname.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/07_cdevname.diff 2013-05-17 15:11:14 UTC (rev 4440)
+++ trunk/freebsd-quota/debian/patches/07_cdevname.diff 2013-05-17 19:01:39 UTC (rev 4441)
@@ -6,9 +6,14 @@
Forwarded: not-needed
Last-Update: 2011-03-01
---- freebsd-quota-8.2.orig/sbin/fsck/fsutil.c
-+++ freebsd-quota-8.2/sbin/fsck/fsutil.c
-@@ -64,11 +64,13 @@ setcdevname(const char *cd, int pr)
+---
+ sbin/fsck/fsutil.c | 2 ++
+ sbin/fsck/fsutil.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/sbin/fsck/fsutil.c
++++ b/sbin/fsck/fsutil.c
+@@ -62,11 +62,13 @@ setcdevname(const char *cd, int pr)
preen = pr;
}
@@ -22,11 +27,11 @@
static void
vmsg(int fatal, const char *fmt, va_list ap)
---- freebsd-quota-8.2.orig/sbin/fsck/fsutil.h
-+++ freebsd-quota-8.2/sbin/fsck/fsutil.h
-@@ -39,7 +39,9 @@ void pwarn(const char *, ...)
- void panic(const char *, ...) __attribute__ ((noreturn))
- __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
+--- a/sbin/fsck/fsutil.h
++++ b/sbin/fsck/fsutil.h
+@@ -36,7 +36,9 @@ void pfatal(const char *, ...) __printfl
+ void pwarn(const char *, ...) __printflike(1, 2);
+ void panic(const char *, ...) __dead2 __printflike(1, 2);
const char *devcheck(const char *);
+#if 0
const char *cdevname(void);
Modified: trunk/freebsd-quota/debian/rules
===================================================================
--- trunk/freebsd-quota/debian/rules 2013-05-17 15:11:14 UTC (rev 4440)
+++ trunk/freebsd-quota/debian/rules 2013-05-17 19:01:39 UTC (rev 4441)
@@ -10,8 +10,8 @@
ORIGDIR = $(SOURCE)-$(VERSION)
TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' \
- -D'__RCSID(string)='
+CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE \
+ $(shell pkg-config --cflags libbsd-overlay)
PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
More information about the Glibc-bsd-commits
mailing list