[Glibc-bsd-commits] r5202 - in trunk/freebsd-libs/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Sat Nov 30 12:12:45 UTC 2013
Author: rmh
Date: 2013-11-30 12:12:45 +0000 (Sat, 30 Nov 2013)
New Revision: 5202
Added:
trunk/freebsd-libs/debian/libutil-freebsd-9.install
trunk/freebsd-libs/debian/libutil-freebsd-9.symbols
trunk/freebsd-libs/debian/libutil-freebsd-dev.install
trunk/freebsd-libs/debian/patches/assume_default_login_class.diff
trunk/freebsd-libs/debian/patches/rlimit.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/copyright
trunk/freebsd-libs/debian/patches/makefiles.diff
trunk/freebsd-libs/debian/patches/series
trunk/freebsd-libs/debian/rules
Log:
Add libutil.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2013-11-30 12:08:59 UTC (rev 5201)
+++ trunk/freebsd-libs/debian/changelog 2013-11-30 12:12:45 UTC (rev 5202)
@@ -1,3 +1,9 @@
+freebsd-libs (9.2+ds2-1) experimental; urgency=low
+
+ * Add libutil.
+
+ -- Robert Millan <rmh at debian.org> Sat, 30 Nov 2013 13:10:29 +0100
+
freebsd-libs (9.2+ds1-8) unstable; urgency=low
* Simplify 04_libkvm.diff even further.
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2013-11-30 12:08:59 UTC (rev 5201)
+++ trunk/freebsd-libs/debian/control 2013-11-30 12:12:45 UTC (rev 5202)
@@ -8,7 +8,7 @@
libbsd-dev (>= 0.3.0),
libc0.1-dev (>= 2.13-31) [kfreebsd-any],
libgdbm-dev [kfreebsd-any],
- kfreebsd-kernel-headers (>= 9.1) [kfreebsd-any],
+ kfreebsd-kernel-headers (>= 9.2~5) [kfreebsd-any],
# libexpat-dev: aka bsdxml. needed by libgeom
libexpat-dev [kfreebsd-any],
# libncurses5-dev: needed by libalias
@@ -81,6 +81,21 @@
This package contains the header files and static library needed to
compile applications that use libelf.
+Package: libutil-freebsd-9
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD utility library
+ Miscellaneous system facilities.
+
+Package: libutil-freebsd-dev
+Section: libdevel
+Architecture: any
+Depends: libutil-freebsd-9 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Replaces: freebsd-glue (>= 0.0.15~)
+Description: Development files for libutil-freebsd
+ This package contains the header files and static library needed to
+ compile applications that use libutil-freebsd.
+
Package: libcam6
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Modified: trunk/freebsd-libs/debian/copyright
===================================================================
--- trunk/freebsd-libs/debian/copyright 2013-11-30 12:08:59 UTC (rev 5201)
+++ trunk/freebsd-libs/debian/copyright 2013-11-30 12:12:45 UTC (rev 5202)
@@ -432,3 +432,125 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
+
+
+Files: lib/libutil/_secure_path.c
+ lib/libutil/login_auth.c
+ lib/libutil/login_cap.c
+ lib/libutil/login_cap.h
+ lib/libutil/login_class.c
+ lib/libutil/login_ok.c
+ lib/libutil/login_times.c
+Copyright: 1995,1997, by Berkeley Software Design, Inc.
+ 1996, by Sean Eric Fagan <sef at kithrup.com> and David Nugent <davidn at blaze.net.au>
+License: BSD (5 clause)
+
+Files: lib/libutil/login_tty.c
+ lib/libutil/pty.c
+ lib/libutil/uucplock.c
+Copyright: 1988, 1990, 1993-1994, The Regents of the University of California
+License: BSD (3 clause)
+
+Files: lib/libutil/login_tty.3
+ lib/libutil/pty.3
+Copyright: 1996, Joerg Wunsch
+License: BSD (2 clause)
+
+Files: lib/libutil/auth.c
+ lib/libutil/property.c
+Copyright: 1998, Jordan Hubbard
+License: BSD (2 clause)
+
+Files: lib/libutil/login_crypt.c
+ lib/libutil/stub.c
+Copyright: 2000, Brian Fundakowski Feldman
+License: BSD (2 clause)
+
+Files: lib/libutil/realhostname.c
+ lib/libutil/trimdomain.c
+ lib/libutil/realhostname.3
+ lib/libutil/trimdomain.3
+Copyright: 1999, 2001, Brian Somers <brian at Awfulhak.org>
+License: BSD (2 clause)
+
+Files: lib/libutil/flopen.c
+ lib/libutil/kld.c
+ lib/libutil/flopen.3
+ lib/libutil/kld.3
+Copyright: 2006, 2007, Dag-Erling Coïdan Smørgrav
+License: BSD (2 clause)
+
+Files: lib/libutil/kinfo_getfile.3
+ lib/libutil/kinfo_getvmmap.3
+Copyright: 2008, Peter Wemm
+License: BSD (2 clause)
+
+Files: lib/libutil/quotafile.c
+Copyright: 2008, Dag-Erling Coïdan Smørgrav
+ 2008, Marshall Kirk McKusick
+License: BSD (2 clause)
+
+Files: lib/libutil/expand_number.c
+Copyright: 2007, Eric Anderson <anderson at FreeBSD.org>
+ 2007, Pawel Jakub Dawidek <pjd at FreeBSD.org>
+License: BSD (2 clause)
+
+Files: lib/libutil/pidfile.c
+Copyright: 2005, Pawel Jakub Dawidek <pjd at FreeBSD.org>
+License: BSD (2 clause)
+
+Files: lib/libutil/kinfo_getallproc.c
+Copyright: 2007, Robert N. M. Watson
+ 2009, Ulf Lilleengen
+License: BSD (2 clause)
+
+Files: lib/libutil/kinfo_getallproc.3
+ lib/libutil/kinfo_getproc.c
+ lib/libutil/kinfo_getproc.3
+Copyright: 2009, Ulf Lilleengen
+License: BSD (2 clause)
+
+Files: lib/libutil/gr_util.c
+Copyright: 2008, Sean C. Farley <scf at FreeBSD.org>
+License: BSD (2 clause)
+
+Files: lib/libutil/humanize_number.c
+Copyright: 1997-1999, 2002 The NetBSD Foundation, Inc
+License: BSD (2 clause)
+
+Files: lib/libutil/pw_util.c
+Copyright: 1990, 1993-1994,
+ 2002, Networks Associates Technology, Inc
+License: BSD (3 clause)
+
+Files: lib/libutil/hexdump.c
+Copyright: 1986, 1988, 1991, 1993
+ UNIX System Laboratories, Inc
+License: BSD (3 clause)
+
+Files: lib/libutil/libutil.h
+Copyright: 1996, Peter Wemm <peter at FreeBSD.org>
+ 2002, Networks Associates Technology, Inc
+License: BSD (3 clause)
+
+Files: lib/libutil/fparseln.c
+Copyright: 1997, Christos Zoulas.
+License: BSD (4 clause)
+
+
+
+License: BSD (5 clause)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, is permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice immediately at the beginning of the file, without modification,
+ * this list of conditions, and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. This work was done expressly for inclusion into FreeBSD. Other use
+ * is permitted provided this notation is included.
+ * 4. Absolutely no warranty of function or purpose is made by the authors.
+ * 5. Modifications may be freely made to this file providing the above
+ * conditions are met.
Added: trunk/freebsd-libs/debian/libutil-freebsd-9.install
===================================================================
--- trunk/freebsd-libs/debian/libutil-freebsd-9.install (rev 0)
+++ trunk/freebsd-libs/debian/libutil-freebsd-9.install 2013-11-30 12:12:45 UTC (rev 5202)
@@ -0,0 +1 @@
+lib/libutil-freebsd.so.*
Added: trunk/freebsd-libs/debian/libutil-freebsd-9.symbols
===================================================================
--- trunk/freebsd-libs/debian/libutil-freebsd-9.symbols (rev 0)
+++ trunk/freebsd-libs/debian/libutil-freebsd-9.symbols 2013-11-30 12:12:45 UTC (rev 5202)
@@ -0,0 +1,46 @@
+libutil-freebsd.so.9 libutil-freebsd-9 #MINVER#
+ _secure_path at Base 9.2
+ crypt_set_format at Base 9.2
+ expand_number at Base 9.2
+ flopen at Base 9.2
+ fparseln at Base 9.2
+ gr_copy at Base 9.2
+ gr_dup at Base 9.2
+ gr_equal at Base 9.2
+ gr_fini at Base 9.2
+ gr_init at Base 9.2
+ gr_lock at Base 9.2
+ gr_make at Base 9.2
+ gr_mkdb at Base 9.2
+ gr_scan at Base 9.2
+ gr_tmp at Base 9.2
+ hexdump at Base 9.2
+ humanize_number at Base 9.2
+ (arch=kfreebsd-any)login_close at Base 9.2
+ (arch=kfreebsd-any)login_getcapbool at Base 9.2
+ (arch=kfreebsd-any)login_getcaplist at Base 9.2
+ (arch=kfreebsd-any)login_getcapnum at Base 9.2
+ (arch=kfreebsd-any)login_getcapsize at Base 9.2
+ (arch=kfreebsd-any)login_getcapstr at Base 9.2
+ (arch=kfreebsd-any)login_getcaptime at Base 9.2
+ (arch=kfreebsd-any)login_getclass at Base 9.2
+ (arch=kfreebsd-any)login_getclassbyname at Base 9.2
+ (arch=kfreebsd-any)login_getpath at Base 9.2
+ (arch=kfreebsd-any)login_getpwclass at Base 9.2
+ (arch=kfreebsd-any)login_getstyle at Base 9.2
+ (arch=kfreebsd-any)login_getuserclass at Base 9.2
+ (arch=kfreebsd-any)pidfile_close at Base 9.2
+ (arch=kfreebsd-any)pidfile_fileno at Base 9.2
+ (arch=kfreebsd-any)pidfile_open at Base 9.2
+ (arch=kfreebsd-any)pidfile_remove at Base 9.2
+ (arch=kfreebsd-any)pidfile_write at Base 9.2
+ (arch=kfreebsd-any)setclasscontext at Base 9.2
+ (arch=kfreebsd-any)setclasscpumask at Base 9.2
+ (arch=kfreebsd-any)setclassenvironment at Base 9.2
+ (arch=kfreebsd-any)setclassresources at Base 9.2
+ (arch=kfreebsd-any)setusercontext at Base 9.2
+ trimdomain at Base 9.2
+ uu_lock at Base 9.2
+ uu_lock_txfr at Base 9.2
+ uu_lockerr at Base 9.2
+ uu_unlock at Base 9.2
Added: trunk/freebsd-libs/debian/libutil-freebsd-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libutil-freebsd-dev.install (rev 0)
+++ trunk/freebsd-libs/debian/libutil-freebsd-dev.install 2013-11-30 12:12:45 UTC (rev 5202)
@@ -0,0 +1,4 @@
+usr/lib/libutil-freebsd.a
+usr/lib/libutil-freebsd*.so
+usr/include/libutil.h
+usr/include/login_cap.h
Added: trunk/freebsd-libs/debian/patches/assume_default_login_class.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/assume_default_login_class.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/assume_default_login_class.diff 2013-11-30 12:12:45 UTC (rev 5202)
@@ -0,0 +1,13 @@
+
+We don't have this feature. See login.conf(5)
+
+--- a/lib/libutil/login_cap.c
++++ b/lib/libutil/login_cap.c
+@@ -324,7 +324,6 @@
+ const char *cls = NULL;
+
+ if (pwd != NULL) {
+- cls = pwd->pw_class;
+ if (cls == NULL || *cls == '\0')
+ cls = (pwd->pw_uid == 0) ? LOGIN_DEFROOTCLASS : LOGIN_DEFCLASS;
+ }
Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff 2013-11-30 12:08:59 UTC (rev 5201)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff 2013-11-30 12:12:45 UTC (rev 5202)
@@ -1,3 +1,34 @@
+--- a/lib/libutil/Makefile
++++ b/lib/libutil/Makefile
+@@ -5,18 +5,22 @@
+
+ .include <bsd.own.mk>
+
+-LIB= util
++LIB= util-freebsd
+ SHLIB_MAJOR= 9
+
+ SRCS= _secure_path.c expand_number.c flopen.c fparseln.c gr_util.c \
+- hexdump.c humanize_number.c kinfo_getfile.c kinfo_getfile.c \
+- kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c kld.c \
+- login_auth.c login_cap.c \
+- login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
+- pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \
++ hexdump.c humanize_number.c \
+ stub.c trimdomain.c uucplock.c
+ INCS= libutil.h login_cap.h
+
++SYS!= dpkg-architecture -qDEB_HOST_GNU_SYSTEM
++.if ${SYS} == "kfreebsd-gnu"
++SRCS+= login_cap.c login_class.c \
++ pidfile.c
++.endif
++
++LDADD= -lbsd -lfreebsd-glue
++
+ CFLAGS+= -DLIBC_SCCS
+
+ .if ${MK_INET6_SUPPORT} != "no"
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -4,6 +4,7 @@
Added: trunk/freebsd-libs/debian/patches/rlimit.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/rlimit.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/rlimit.diff 2013-11-30 12:12:45 UTC (rev 5202)
@@ -0,0 +1,12 @@
+--- a/lib/libutil/login_class.c
++++ b/lib/libutil/login_class.c
+@@ -47,6 +47,9 @@
+ #include <syslog.h>
+ #include <unistd.h>
+
++#define RLIMIT_VMEM RLIMIT_AS
++#define RLIMIT_NPTS 11
++#define RLIMIT_SWAP 12
+
+ static struct login_res {
+ const char *what;
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2013-11-30 12:08:59 UTC (rev 5201)
+++ trunk/freebsd-libs/debian/patches/series 2013-11-30 12:12:45 UTC (rev 5202)
@@ -27,4 +27,6 @@
# Patches that are likely to be Debian-specific
libusb_pthread_condattr_setclock.diff
libbsd_nlist.diff
+assume_default_login_class.diff
+rlimit.diff
makefiles.diff
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2013-11-30 12:08:59 UTC (rev 5201)
+++ trunk/freebsd-libs/debian/rules 2013-11-30 12:12:45 UTC (rev 5202)
@@ -53,6 +53,7 @@
lib/libkiconv lib/libnetgraph lib/libjail \
lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
lib/libusbhid sys/cam \
+ lib/libutil \
lib/libalias sys/netinet/libalias sys/modules/libalias \
sys/kern/subr_sbuf.c \
sys/sys/sbuf.h \
@@ -74,6 +75,7 @@
build-sbuf \
build-dwarf \
build-elf \
+ build-util \
$(NULL)
ifeq ($(kernel), kfreebsd)
@@ -161,6 +163,11 @@
$(PMAKE) -C $(CURDIR)/lib/libusb SHLIBDIR=./
touch $@
+build-util: build-util-stamp
+build-util-stamp:
+ $(PMAKE) -C $(CURDIR)/lib/libutil SHLIBDIR=./
+ touch $@
+
build-jail: build-jail-stamp
build-jail-stamp:
$(PMAKE) -C $(CURDIR)/lib/libjail SHLIBDIR=./
@@ -177,6 +184,7 @@
$(PMAKE) -C $(CURDIR)/lib/libsbuf clean
$(PMAKE) -C $(CURDIR)/lib/libdwarf clean
$(PMAKE) -C $(CURDIR)/lib/libelf clean
+ $(PMAKE) -C $(CURDIR)/lib/libutil clean
ifeq ($(kernel), kfreebsd)
$(PMAKE) -C $(CURDIR)/lib/libcam clean
$(PMAKE) -C $(CURDIR)/lib/libnetgraph clean
@@ -213,6 +221,7 @@
$(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
$(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libelf install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libutil install SHLIBDIR=/lib
ifeq ($(kernel), kfreebsd)
$(PMAKE) -C $(CURDIR)/lib/libcam install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libgeom install SHLIBDIR=/lib
More information about the Glibc-bsd-commits
mailing list