[Glibc-bsd-commits] r5588 - in trunk/ufsutils/debian: . patches

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Sat Oct 4 18:26:13 UTC 2014 

Author: ps-guest
Date: 2014-10-04 18:26:13 +0000 (Sat, 04 Oct 2014)
New Revision: 5588

Added:
   trunk/ufsutils/debian/patches/mk_tests.diff
Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/exit_codes.diff
   trunk/ufsutils/debian/patches/fsck_getopt.diff
   trunk/ufsutils/debian/patches/makefiles.diff
   trunk/ufsutils/debian/patches/series
   trunk/ufsutils/debian/rules
Log:
snapshot for ufsutils


Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2014-10-04 18:05:11 UTC (rev 5587)
+++ trunk/ufsutils/debian/changelog	2014-10-04 18:26:13 UTC (rev 5588)
@@ -1,3 +1,12 @@
+ufsutils (10.1~svn272500-1) UNRELEASED; urgency=medium
+
+  [ Petr Salinger ]
+  * New upstream snapshot of 10.1 releng branch
+    - refresh patches
+    - add mk_tests.diff
+
+ -- Robert Millan <rmh at debian.org>  Sat, 04 Oct 2014 20:24:56 +0200
+
 ufsutils (10.0-3) unstable; urgency=medium
 
   * Fix FTBFS due to missing <libutil.h> by adding a libutil-freebsd-dev

Modified: trunk/ufsutils/debian/patches/exit_codes.diff
===================================================================
--- trunk/ufsutils/debian/patches/exit_codes.diff	2014-10-04 18:05:11 UTC (rev 5587)
+++ trunk/ufsutils/debian/patches/exit_codes.diff	2014-10-04 18:26:13 UTC (rev 5588)
@@ -10,18 +10,18 @@
 
 --- a/sbin/fsck_ffs/fsck.h
 +++ b/sbin/fsck_ffs/fsck.h
-@@ -359,7 +359,7 @@
+@@ -360,7 +360,7 @@ extern struct	ufs2_dinode ufs2_zino;
  #define	ALTERED	0x08
  #define	FOUND	0x10
  
 -#define	EEXIT	8		/* Standard error exit. */
 +#define	EEXIT	4		/* Standard error exit. */
+ #define	ERESTART -1
  
  int flushentry(void);
- /*
 --- a/sbin/fsck_ffs/main.c
 +++ b/sbin/fsck_ffs/main.c
-@@ -253,7 +253,7 @@
+@@ -264,7 +264,7 @@ checkfilesys(char *filesys)
  	sblock_init();
  	if (bkgrdcheck) {
  		if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0)
@@ -30,7 +30,7 @@
  		close(fsreadfd);
  		/* Earlier background failed or journaled */
  		if (sblock.fs_flags & (FS_NEEDSFSCK | FS_SUJ))
-@@ -273,7 +273,7 @@
+@@ -284,7 +284,7 @@ checkfilesys(char *filesys)
  		 * If file system is gjournaled, check it here.
  		 */
  		if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0)
@@ -39,7 +39,7 @@
  		close(fsreadfd);
  		if ((sblock.fs_flags & FS_GJOURNAL) != 0) {
  			//printf("GJournaled file system detected on %s.\n",
-@@ -406,8 +406,8 @@
+@@ -417,8 +417,8 @@ checkfilesys(char *filesys)
  				if (suj_check(filesys) == 0) {
  					printf("\n***** FILE SYSTEM MARKED CLEAN *****\n");
  					if (chkdoreload(mntp) == 0)
@@ -50,10 +50,12 @@
  				}
  			}
  			printf("** Skipping journal, falling through to full fsck\n\n");
-@@ -654,5 +654,5 @@
+@@ -669,7 +669,7 @@ usage(void)
  	(void) fprintf(stderr,
  "usage: %s [-BEFfnpry] [-b block] [-c level] [-m mode] filesystem ...\n",
  	    getprogname());
 -	exit(1);
 +	exit(16);
  }
+ 
+ void

Modified: trunk/ufsutils/debian/patches/fsck_getopt.diff
===================================================================
--- trunk/ufsutils/debian/patches/fsck_getopt.diff	2014-10-04 18:05:11 UTC (rev 5587)
+++ trunk/ufsutils/debian/patches/fsck_getopt.diff	2014-10-04 18:26:13 UTC (rev 5588)
@@ -1,15 +1,15 @@
 --- a/sbin/fsck_ffs/main.c
 +++ b/sbin/fsck_ffs/main.c
-@@ -82,7 +82,7 @@
+@@ -84,7 +84,7 @@ main(int argc, char *argv[])
  	sync();
  	skipclean = 1;
  	inoopt = 0;
--	while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:nprSyZ")) != -1) {
-+	while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:nprSyZa")) != -1) {
+-	while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npRrSyZ")) != -1) {
++	while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npRrSyZa")) != -1) {
  		switch (ch) {
  		case 'b':
  			skipclean = 0;
-@@ -130,6 +130,8 @@
+@@ -132,6 +132,8 @@ main(int argc, char *argv[])
  			yflag = 0;
  			break;
  

Modified: trunk/ufsutils/debian/patches/makefiles.diff
===================================================================
--- trunk/ufsutils/debian/patches/makefiles.diff	2014-10-04 18:05:11 UTC (rev 5587)
+++ trunk/ufsutils/debian/patches/makefiles.diff	2014-10-04 18:26:13 UTC (rev 5588)
@@ -1,6 +1,6 @@
 --- a/sbin/badsect/Makefile
 +++ b/sbin/badsect/Makefile
-@@ -7,4 +7,7 @@
+@@ -7,4 +7,7 @@ LDADD=	-lufs
  MAN=	badsect.8
  WARNS?=	2
  
@@ -10,7 +10,7 @@
  .include <bsd.prog.mk>
 --- a/sbin/dumpfs/Makefile
 +++ b/sbin/dumpfs/Makefile
-@@ -7,4 +7,9 @@
+@@ -7,4 +7,9 @@ DPADD=	${LIBUFS}
  LDADD=	-lufs
  MAN=	dumpfs.8
  
@@ -22,7 +22,7 @@
  .include <bsd.prog.mk>
 --- a/sbin/ffsinfo/Makefile
 +++ b/sbin/ffsinfo/Makefile
-@@ -16,4 +16,7 @@
+@@ -16,4 +16,7 @@ CFLAGS+=-DFS_DEBUG -I${GROWFS}
  DPADD=	${LIBUFS}
  LDADD=	-lufs
  
@@ -32,7 +32,7 @@
  .include <bsd.prog.mk>
 --- a/sbin/fsck_ffs/Makefile
 +++ b/sbin/fsck_ffs/Makefile
-@@ -13,6 +13,11 @@
+@@ -14,6 +14,11 @@ LDADD=	-lufs
  WARNS?=	2
  CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mount
  
@@ -65,7 +65,7 @@
  test:	${PROG}
 --- a/sbin/tunefs/Makefile
 +++ b/sbin/tunefs/Makefile
-@@ -6,6 +6,9 @@
+@@ -6,6 +6,9 @@ DPADD=	${LIBUFS}
  LDADD=	-lufs
  MAN=	tunefs.8
  
@@ -77,7 +77,7 @@
  .include <bsd.prog.mk>
 --- a/sbin/growfs/Makefile
 +++ b/sbin/growfs/Makefile
-@@ -18,6 +18,8 @@
+@@ -20,7 +20,9 @@ SRCS+=  debug.c
  .endif  
  
  DPADD=	${LIBUTIL}
@@ -86,11 +86,12 @@
 +
 +LDADD+=		-lbsd -lfreebsd-glue
  
- .include <bsd.prog.mk>      
+ .if ${MK_TESTS} != "no"
+ SUBDIR+=    tests
 --- a/sbin/fsdb/Makefile
 +++ b/sbin/fsdb/Makefile
-@@ -9,8 +9,11 @@
- 	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
+@@ -9,8 +9,11 @@ SRCS=	fsdb.c fsdbutil.c \
+ 	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c
  CFLAGS+= -I${.CURDIR}/../fsck_ffs
  WARNS?= 2
 -LDADD=	-ledit -ltermcap
@@ -104,7 +105,7 @@
  .include <bsd.prog.mk>
 --- a/lib/libufs/Makefile
 +++ b/lib/libufs/Makefile
-@@ -7,6 +7,8 @@
+@@ -7,6 +7,8 @@ SHLIB_MAJOR=	6
  SRCS=	block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c
  INCS=	libufs.h
  

Added: trunk/ufsutils/debian/patches/mk_tests.diff
===================================================================
--- trunk/ufsutils/debian/patches/mk_tests.diff	                        (rev 0)
+++ trunk/ufsutils/debian/patches/mk_tests.diff	2014-10-04 18:26:13 UTC (rev 5588)
@@ -0,0 +1,15 @@
+Don't use MK_TESTS yet:  freebsd-buildutils >> 10.1~ will add it;
+it defaults to "no" anyway.
+
+
+--- a/sbin/growfs/Makefile
++++ b/sbin/growfs/Makefile
+@@ -24,8 +24,4 @@ DPADD=	${LIBUTIL}
+ 
+ LDADD+=		-lbsd -lfreebsd-glue
+ 
+-.if ${MK_TESTS} != "no"
+-SUBDIR+=    tests
+-.endif
+-
+ .include <bsd.prog.mk>      

Modified: trunk/ufsutils/debian/patches/series
===================================================================
--- trunk/ufsutils/debian/patches/series	2014-10-04 18:05:11 UTC (rev 5587)
+++ trunk/ufsutils/debian/patches/series	2014-10-04 18:26:13 UTC (rev 5588)
@@ -11,3 +11,4 @@
 04_avoid_diocgdelete.patch
 operator_gid.diff
 makefiles.diff
+mk_tests.diff

Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules	2014-10-04 18:05:11 UTC (rev 5587)
+++ trunk/ufsutils/debian/rules	2014-10-04 18:26:13 UTC (rev 5588)
@@ -35,8 +35,8 @@
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
 
-SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
-#SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
+#SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
+SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
 #SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
 #SVN		:= https://svn0.us-west.freebsd.org/base/head

More information about the Glibc-bsd-commits mailing list