[Glibc-bsd-commits] r3438 - in trunk/freebsd-libs/debian: . patches

Guillem Jover guillem at alioth.debian.org
Sun Jun 12 03:56:52 UTC 2011 

Author: guillem
Date: 2011-06-12 03:56:51 +0000 (Sun, 12 Jun 2011)
New Revision: 3438

Added:
   trunk/freebsd-libs/debian/libjail-dev.install
   trunk/freebsd-libs/debian/libjail1-udeb.install
   trunk/freebsd-libs/debian/libjail1.install
   trunk/freebsd-libs/debian/libjail1.symbols
   trunk/freebsd-libs/debian/patches/13_jail.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/copyright
   trunk/freebsd-libs/debian/patches/series
   trunk/freebsd-libs/debian/rules
Log:
Add new libjail library packages

Based-on-patch-by: Robert Millan <rmh at debian.org>

Closes: #629521


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-06-12 01:42:27 UTC (rev 3437)
+++ trunk/freebsd-libs/debian/changelog	2011-06-12 03:56:51 UTC (rev 3438)
@@ -1,7 +1,9 @@
-freebsd-libs (8.2-3) UNRELEASED; urgency=low
+freebsd-libs (8.2+ds1-1) UNRELEASED; urgency=low
 
   * Bump libgeom SOVERSION from 0 to 1 and rename package libgeom0 to
     libgeom1, due to ABI changes in ‘struct gprovider’. (Closes: #630107)
+  * Add new libjail library packages. Based on a patch by Robert Millan.
+    (Closes: #629521)
 
  -- Guillem Jover <guillem at debian.org>  Sun, 12 Jun 2011 03:27:53 +0200
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2011-06-12 01:42:27 UTC (rev 3437)
+++ trunk/freebsd-libs/debian/control	2011-06-12 03:56:51 UTC (rev 3438)
@@ -5,7 +5,7 @@
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
 Build-Depends: debhelper (>= 7), pkg-config, freebsd-buildutils,
  libbsd-dev (>= 0.3.0) [kfreebsd-any],
- libc0.1-dev (>= 2.10) [kfreebsd-any],
+ libc0.1-dev (>= 2.13-0exp2) [kfreebsd-any],
  libgdbm-dev [kfreebsd-any],
  kfreebsd-kernel-headers (>= 0.54) [kfreebsd-any],
 # libexpat-dev: aka bsdxml. needed by libgeom
@@ -245,3 +245,27 @@
 Description: Development files for libkiconv
  This package contains the header files and static library needed to
  compile applications that use libkiconv.
+
+Package: libjail1
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD jail library
+ The jail library provides support for FreeBSD jails.
+
+Package: libjail1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD jail library (udeb)
+ The jail library provides support for FreeBSD jails.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libjail-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libjail1 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libjail
+ This package contains the header files and static library needed to
+ compile applications that use libjail.

Modified: trunk/freebsd-libs/debian/copyright
===================================================================
--- trunk/freebsd-libs/debian/copyright	2011-06-12 01:42:27 UTC (rev 3437)
+++ trunk/freebsd-libs/debian/copyright	2011-06-12 03:56:51 UTC (rev 3438)
@@ -40,6 +40,7 @@
     Copyright (C) 2007 Pawel Jakub Dawidek <pjd at FreeBSD.org>
     Copyright (C) 2007 Scott Long
     Copyright (C) 2008 Yahoo!, Inc.
+    Copyright (c) 2009 James Gritton.
 
 
 Licenses:
@@ -54,6 +55,10 @@
            lib/libgeom/geom_util.c
            lib/libgeom/geom_xml2tree.c
            lib/libgeom/libgeom.h
+           lib/libjail/jail.3
+           lib/libjail/jail.c
+           lib/libjail/jail_getid.c
+           lib/libjail/jail.h
            lib/libkiconv/quirks.c
            lib/libkiconv/quirks.h
            lib/libkiconv/xlat16_iconv.c

Added: trunk/freebsd-libs/debian/libjail-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libjail-dev.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libjail-dev.install	2011-06-12 03:56:51 UTC (rev 3438)
@@ -0,0 +1,17 @@
+usr/include/jail.h
+usr/lib/libjail.a
+usr/lib/libjail*.so
+usr/share/man/man3/jail.3.gz
+usr/share/man/man3/jail_getid.3.gz
+usr/share/man/man3/jail_getname.3.gz
+usr/share/man/man3/jail_getv.3.gz
+usr/share/man/man3/jail_setv.3.gz
+usr/share/man/man3/jailparam.3.gz
+usr/share/man/man3/jailparam_all.3.gz
+usr/share/man/man3/jailparam_init.3.gz
+usr/share/man/man3/jailparam_import.3.gz
+usr/share/man/man3/jailparam_import_raw.3.gz
+usr/share/man/man3/jailparam_get.3.gz
+usr/share/man/man3/jailparam_set.3.gz
+usr/share/man/man3/jailparam_export.3.gz
+usr/share/man/man3/jailparam_free.3.gz

Added: trunk/freebsd-libs/debian/libjail1-udeb.install
===================================================================
--- trunk/freebsd-libs/debian/libjail1-udeb.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libjail1-udeb.install	2011-06-12 03:56:51 UTC (rev 3438)
@@ -0,0 +1 @@
+lib/libjail*.so.*

Added: trunk/freebsd-libs/debian/libjail1.install
===================================================================
--- trunk/freebsd-libs/debian/libjail1.install	                        (rev 0)
+++ trunk/freebsd-libs/debian/libjail1.install	2011-06-12 03:56:51 UTC (rev 3438)
@@ -0,0 +1 @@
+lib/libjail*.so.*

Added: trunk/freebsd-libs/debian/libjail1.symbols
===================================================================
--- trunk/freebsd-libs/debian/libjail1.symbols	                        (rev 0)
+++ trunk/freebsd-libs/debian/libjail1.symbols	2011-06-12 03:56:51 UTC (rev 3438)
@@ -0,0 +1,14 @@
+libjail.so.1 libjail1 #MINVER#
+ jail_errmsg at Base 8.2
+ jail_getid at Base 8.2
+ jail_getname at Base 8.2
+ jail_getv at Base 8.2
+ jail_setv at Base 8.2
+ jailparam_all at Base 8.2
+ jailparam_export at Base 8.2
+ jailparam_free at Base 8.2
+ jailparam_get at Base 8.2
+ jailparam_import at Base 8.2
+ jailparam_import_raw at Base 8.2
+ jailparam_init at Base 8.2
+ jailparam_set at Base 8.2

Added: trunk/freebsd-libs/debian/patches/13_jail.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/13_jail.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/13_jail.diff	2011-06-12 03:56:51 UTC (rev 3438)
@@ -0,0 +1,11 @@
+--- a/lib/libjail/Makefile
++++ b/lib/libjail/Makefile
+@@ -24,6 +24,8 @@
+ 
+ CFLAGS+=-I${.CURDIR}
+ 
++LDADD += -lbsd
++
+ WARNS?=	6
+ 
+ .include <bsd.lib.mk>

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2011-06-12 01:42:27 UTC (rev 3437)
+++ trunk/freebsd-libs/debian/patches/series	2011-06-12 03:56:51 UTC (rev 3438)
@@ -10,3 +10,4 @@
 10_memstat.diff
 11_netgraph.diff
 12_usb.diff
+13_jail.diff

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2011-06-12 01:42:27 UTC (rev 3437)
+++ trunk/freebsd-libs/debian/rules	2011-06-12 03:56:51 UTC (rev 3438)
@@ -21,8 +21,9 @@
 endif
 
 SOURCE = freebsd-libs
-VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
-SVN = http://svn.freebsd.org/base/release/$(VERSION).0
+VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-[^-]*$$/\1/p')
+SVN_REL = $(shell echo $(VERSION) | sed -ne 's/+[^+]*$$//p')
+SVN = http://svn.freebsd.org/base/release/$(SVN_REL).0
 #SVN = http://svn.freebsd.org/base/releng/8.1
 ORIGDIR = $(SOURCE)-$(VERSION)
 TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
@@ -37,7 +38,7 @@
 get-orig-source:
 	rm -rf $(ORIGDIR)
 	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx \
-	         lib/libkiconv lib/libnetgraph \
+	         lib/libkiconv lib/libnetgraph lib/libjail \
 	         lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
 	         lib/libusbhid sys/cam ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
@@ -55,7 +56,7 @@
 	rm -rf $(ORIGDIR)
 
 ifeq ($(kernel), kfreebsd)
-build: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-usb build-devstat build-memstat build-netgraph
+build: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-usb build-devstat build-memstat build-netgraph build-jail
 else
 build: build-sbuf
 endif
@@ -115,6 +116,11 @@
 	$(PMAKE) -C $(CURDIR)/lib/libusb SHLIBDIR=./
 	touch $@
 
+build-jail: build-jail-stamp
+build-jail-stamp:
+	$(PMAKE) -C $(CURDIR)/lib/libjail SHLIBDIR=./
+	touch $@
+
 clean:
 	dh_testdir
 	dh_testroot
@@ -130,6 +136,7 @@
 	$(PMAKE) -C $(CURDIR)/lib/libkvm clean
 	$(PMAKE) -C $(CURDIR)/lib/libusbhid clean
 	$(PMAKE) -C $(CURDIR)/lib/libusb clean
+	$(PMAKE) -C $(CURDIR)/lib/libjail clean
 endif
 	rm -f *stamp
 	dh_clean
@@ -153,6 +160,7 @@
 	$(PMAKE) -C $(CURDIR)/lib/libnetgraph install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libusbhid install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libusb install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libjail install SHLIBDIR=/lib
 
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
 	install -m644 debian/libusb*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig
@@ -199,6 +207,7 @@
 	dh_makeshlibs -plibipx2 --add-udeb=libipx2-udeb
 	dh_makeshlibs -plibsbuf0 --add-udeb=libsbuf0-udeb
 	dh_makeshlibs -plibusb2 --add-udeb=libusb2-udeb
+	dh_makeshlibs -plibjail1 --add-udeb=libjail1-udeb
 endif
 	dh_installdeb -a
 	dh_shlibdeps -a

More information about the Glibc-bsd-commits mailing list