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

Robert Millan rmh at alioth.debian.org
Sun Aug 4 15:30:41 UTC 2013 

Author: rmh
Date: 2013-08-04 15:30:41 +0000 (Sun, 04 Aug 2013)
New Revision: 4858

Removed:
   trunk/freebsd-utils/debian/patches/036_nfs_glibc.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/002_ifconfig.diff
   trunk/freebsd-utils/debian/patches/007_mount.diff
   trunk/freebsd-utils/debian/patches/035_nfs.diff
   trunk/freebsd-utils/debian/patches/038_jail.diff
   trunk/freebsd-utils/debian/patches/series
   trunk/freebsd-utils/debian/rules
Log:
Misc adjustments for freebsd-glue 0.1.0.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/changelog	2013-08-04 15:30:41 UTC (rev 4858)
@@ -1,3 +1,9 @@
+freebsd-utils (9.1-5) UNRELEASED; urgency=low
+
+  * Misc adjustments for freebsd-glue 0.1.0.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 17:30:14 +0200
+
 freebsd-utils (9.1-4) unstable; urgency=high
 
   * Bump urgency due to #718490.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/control	2013-08-04 15:30:41 UTC (rev 4858)
@@ -9,7 +9,7 @@
 Build-Depends: debhelper (>= 7), po-debconf, sharutils,
  flex | flex-old,
  freebsd-buildutils (>= 9.0-8~),
- freebsd-glue (>= 0.0.10~),
+ freebsd-glue (>= 0.1.0~),
  kfreebsd-kernel-headers (>= 9.1-3~),
  libc0.1-dev (>= 2.13-26),
  libbsd-dev (>= 0.3.0), pkg-config,

Modified: trunk/freebsd-utils/debian/patches/002_ifconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_ifconfig.diff	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/patches/002_ifconfig.diff	2013-08-04 15:30:41 UTC (rev 4858)
@@ -14,7 +14,7 @@
  SRCS+=	ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
  DPADD+=	${LIBBSDXML} ${LIBSBUF}
 -LDADD+=	-lbsdxml -lsbuf
-+LDADD+=	-lexpat -lsbuf
++LDADD+=	-lexpat -lsbuf -lfreebsd-glue
  
  SRCS+=	ifcarp.c		# SIOC[GS]VH support
  SRCS+=	ifgroup.c		# ...

Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff	2013-08-04 15:30:41 UTC (rev 4858)
@@ -61,7 +61,7 @@
  
  DPADD=	${LIBUTIL}
 -LDADD=	-lutil
-+LDADD=	-lutil -lbsd
++LDADD=	-lutil -lbsd -lfreebsd-glue
  
  .include <bsd.prog.mk>
 --- a/sbin/mount/mount.8

Modified: trunk/freebsd-utils/debian/patches/035_nfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/035_nfs.diff	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/patches/035_nfs.diff	2013-08-04 15:30:41 UTC (rev 4858)
@@ -56,7 +56,7 @@
  
  PROG=	mount_nfs
  SRCS=	mount_nfs.c getmntopts.c mounttab.c
-+LDADD=	-ltirpc
++LDADD=	-ltirpc -lfreebsd-glue
  MAN=	mount_nfs.8
  MLINKS=	mount_nfs.8 mount_oldnfs.8
  
@@ -74,7 +74,7 @@
  
  DPADD=	${LIBUTIL}
 -LDADD=	-lutil
-+LDADD=	-ltirpc -lbsd
++LDADD=	-ltirpc -lbsd -lfreebsd-glue
  
  .include <bsd.prog.mk>
 --- a/usr.sbin/mountd/mountd.c
@@ -122,7 +122,7 @@
  
  DPADD=	${LIBRPCSVC} ${LIBUTIL}
 -LDADD=	-lrpcsvc -lutil
-+LDADD= -ltirpc -lbsd
++LDADD= -ltirpc -lbsd -lfreebsd-glue
  
  CLEANFILES= nlm_prot_svc.c nlm_prot.h test
 +CLEANFILES+= nlm_prot_xdr.c

Deleted: trunk/freebsd-utils/debian/patches/036_nfs_glibc.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/036_nfs_glibc.diff	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/patches/036_nfs_glibc.diff	2013-08-04 15:30:41 UTC (rev 4858)
@@ -1,25 +0,0 @@
---- a/usr.sbin/rpc.lockd/Makefile
-+++ b/usr.sbin/rpc.lockd/Makefile
-@@ -6,6 +6,7 @@
- MLINKS=	rpc.lockd.8 lockd.8
- SRCS=	kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c
- SRCS+= nlm_prot_xdr.c sm_inter_xdr.c
-+SRCS+= nlm_syscall.c
- 
- CFLAGS+= -I. -I${.CURDIR}/../../include/rpcsvc
- WARNS?= 3
---- /dev/null
-+++ b/usr.sbin/rpc.lockd/nlm_syscall.c
-@@ -0,0 +1,12 @@
-+#include <unistd.h>
-+#include <sys/syscall.h>
-+
-+#ifndef SYS_nlm_syscall
-+#define SYS_nlm_syscall		154
-+#endif
-+
-+int
-+nlm_syscall (int a, int b, int c, char **d)
-+{
-+  return syscall (SYS_nlm_syscall, a, b, c, d);
-+}

Modified: trunk/freebsd-utils/debian/patches/038_jail.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/038_jail.diff	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/patches/038_jail.diff	2013-08-04 15:30:41 UTC (rev 4858)
@@ -53,3 +53,14 @@
  	/* Set the groups while the group file is still available */
  	if (initgroups(pwd->pw_name, pwd->pw_gid) < 0) {
  		jail_warnx(j, "initgroups %s: %s", pwd->pw_name,
+--- a/usr.sbin/jail/Makefile
++++ b/usr.sbin/jail/Makefile
+@@ -7,7 +7,7 @@
+ SRCS=	jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
+ 
+ DPADD=	${LIBJAIL} ${LIBKVM} ${LIBUTIL} ${LIBL}
+-LDADD=	-ljail -lkvm -lutil -ll
++LDADD=	-ljail -lkvm -lutil -ll -lfreebsd-glue
+ 
+ YFLAGS+=-v
+ CFLAGS+=-I. -I${.CURDIR}

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/patches/series	2013-08-04 15:30:41 UTC (rev 4858)
@@ -40,7 +40,6 @@
 030_arp_libbsd.diff
 031_savecore.diff
 035_nfs.diff
-036_nfs_glibc.diff
 038_jail.diff
 039_geom.diff
 041_delete_key.diff
@@ -48,3 +47,5 @@
 devd_link_c++_statically.diff
 stablerestart-fhs-compliance.diff
 rpc.lockd-startup-fix.diff
+
+# Patches that are likely to be Debian-specific

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2013-08-04 15:14:35 UTC (rev 4857)
+++ trunk/freebsd-utils/debian/rules	2013-08-04 15:30:41 UTC (rev 4858)
@@ -9,6 +9,7 @@
 	-isystem /usr/include/tirpc \
 	-D__FreeBSD_version=__FreeBSD_kernel_version \
 	-Werror=implicit-function-declaration \
+	-isystem /usr/include/freebsd -I$(CURDIR)/debian/local/include -I$(CURDIR)/include -lbsd \
 	$(NULL)
 CXXFLAGS = $(CFLAGS)
 
@@ -38,8 +39,7 @@
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) \
-        -isystem /usr/include/freebsd -I$(CURDIR)/debian/local/include -I$(CURDIR)/include -lbsd" \
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" LDADD="-lfreebsd-glue" \
         NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
         DESTDIR=$(DESTDIR) make

More information about the Glibc-bsd-commits mailing list