[Glibc-bsd-commits] r2056 - in trunk/freebsd-utils: . debian debian/patches

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Mon Dec 3 20:35:20 UTC 2007 

Author: ps-guest
Date: 2007-12-03 20:35:20 +0000 (Mon, 03 Dec 2007)
New Revision: 2056

Added:
   trunk/freebsd-utils/debian/patches/series
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/012_net-tools.diff
   trunk/freebsd-utils/debian/rules
   trunk/freebsd-utils/fetch
Log:
* start preparing for upcoming FreeBSD 6.3 (part of freebsd-utils)



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2007-12-03 20:25:58 UTC (rev 2055)
+++ trunk/freebsd-utils/debian/changelog	2007-12-03 20:35:20 UTC (rev 2056)
@@ -1,11 +1,13 @@
-freebsd-utils (6.2-4) UNRELEASED; urgency=low
+freebsd-utils (6.3-0.1) UNRELEASED; urgency=low
 
   [ Petr Salinger ]
-  * fixup in init.d scripts, suggested by Jerome Warnier
-  * adjust start level of kbdcontrol, suggested by Jerome Warnier
-  * do not use "exec -a", suggested by Thorsten Glaser
+  * Add build-dependency on quilt, and use quilt in debian/rules
+  * Based on kfreebsd-source-6.3
+  * Fixup in init.d scripts, suggested by Jerome Warnier
+  * Adjust start level of kbdcontrol, suggested by Jerome Warnier
+  * Do not use "exec -a", suggested by Thorsten Glaser
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 14 Jul 2007 17:58:39 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 03 Dec 2007 21:19:42 +0100
 
 freebsd-utils (6.2-3) unreleased; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2007-12-03 20:25:58 UTC (rev 2055)
+++ trunk/freebsd-utils/debian/control	2007-12-03 20:35:20 UTC (rev 2056)
@@ -3,7 +3,7 @@
 Priority: important
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd6-buildutils, libkvm-dev (>= 6.1), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.3.6.ds1-9), flex | flex-old, kfreebsd-kernel-headers (>= 0.26), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), quilt, freebsd6-buildutils, libkvm-dev (>= 6.1), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.3.6.ds1-9), flex | flex-old, kfreebsd-kernel-headers (>= 0.27), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev
 # libkvm-dev: dmesg
 # libgeom-dev : ccdconfig
 # libfreebsd (>= 0.0-5): ifconfig

Modified: trunk/freebsd-utils/debian/patches/012_net-tools.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_net-tools.diff	2007-12-03 20:25:58 UTC (rev 2055)
+++ trunk/freebsd-utils/debian/patches/012_net-tools.diff	2007-12-03 20:35:20 UTC (rev 2056)
@@ -1,13 +1,13 @@
 diff -ur src.old/sbin/ifconfig/Makefile src/sbin/ifconfig/Makefile
 --- src.old/sbin/ifconfig/Makefile	2006-05-04 16:40:04.000000000 +0200
 +++ src/sbin/ifconfig/Makefile	2006-05-04 16:44:05.000000000 +0200
-@@ -18,15 +18,15 @@
+@@ -18,16 +18,16 @@
  SRCS+=	af_atalk.c		# AppleTalk support
  
  SRCS+=	ifclone.c		# clone device support
 -SRCS+=	ifmac.c			# MAC support
++#SRCS+=	ifmac.c			# MAC support
  SRCS+=	ifmedia.c		# SIOC[GS]IFMEDIA support
-+#SRCS+=	ifmac.c			# MAC support
  SRCS+=	ifvlan.c		# SIOC[GS]ETVLAN support
  SRCS+=	ifieee80211.c		# SIOC[GS]IEEE80211 support
  
@@ -18,6 +18,8 @@
  
 -SRCS+=	ifbridge.c		# bridge support
 +#SRCS+=	ifbridge.c		# bridge support
+-SRCS+=	iflagg.c		# lagg support
++#SRCS+=	iflagg.c		# lagg support
  
  .if !defined(RELEASE_CRUNCH)
  SRCS+=	af_ipx.c		# IPX support

Added: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/series	2007-12-03 20:35:20 UTC (rev 2056)
@@ -0,0 +1,15 @@
+001_mount.diff
+002_mount_noforce_fstab.diff
+003_mount_syspath_weirdo.diff
+004_umount_missing_getvfsbyname.diff
+005_mount_no_fsid_val.diff
+006_debian_cli_compat_options.diff
+007_rpc_auth.diff
+008_swapon.diff
+009_sysctl_clocktime.diff
+010_sysctl_other.diff
+011_swapon_setprogname.diff
+012_net-tools.diff 
+013_mount_microshit.diff
+014_kldconfig.diff
+015_pf.diff

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2007-12-03 20:25:58 UTC (rev 2055)
+++ trunk/freebsd-utils/debian/rules	2007-12-03 20:35:20 UTC (rev 2056)
@@ -17,7 +17,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 build/freebsd-utils:: apply-patches
 	set -e ; for i in sbin/{ccdconfig,dmesg,mdconfig,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \

Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch	2007-12-03 20:25:58 UTC (rev 2055)
+++ trunk/freebsd-utils/fetch	2007-12-03 20:35:20 UTC (rev 2056)
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -ex
 
-export CVSROOT=freebsdanoncvs at anoncvs.freebsd.org:/home/ncvs
+ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
+RELENG=RELENG_6_3_0_RELEASE
+RELENG=RELENG_6_3
 
 rm -rf src
 
@@ -25,7 +27,7 @@
     src/usr.sbin/kbdcontrol src/share/syscons/keymaps \
     src/bin/chflags \
   ; do
-  cvs ${action} -r RELENG_6_2_0_RELEASE $i
+  cvs -d $ANONCVS ${action} -r $RELENG $i
   test -e $i
 done

More information about the Glibc-bsd-commits mailing list