[24282] in Source-Commits
/svn/athena r23880 - trunk/debathena/debathena/libnss-nonlocal/debian
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sat Jun 20 00:40:34 2009
X-Barracuda-Envelope-From: andersk@mit.edu
Date: Sat, 20 Jun 2009 00:40:23 -0400
From: Anders Kaseorg <andersk@MIT.EDU>
Message-Id: <200906200440.n5K4eNBU009799@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2009-06-20 00:40:23 -0400 (Sat, 20 Jun 2009)
New Revision: 23880
Added:
trunk/debathena/debathena/libnss-nonlocal/debian/lib32nss-nonlocal.install
trunk/debathena/debathena/libnss-nonlocal/debian/lib64nss-nonlocal.install
trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.install
Modified:
trunk/debathena/debathena/libnss-nonlocal/debian/changelog
trunk/debathena/debathena/libnss-nonlocal/debian/control.in
trunk/debathena/debathena/libnss-nonlocal/debian/rules
Log:
In libnss-nonlocal:
* Also build a biarch lib32nss-nonlocal or lib64nss-nonlocal package.
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/changelog
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/changelog 2009-06-20 00:49:46 UTC (rev 23879)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/changelog 2009-06-20 04:40:23 UTC (rev 23880)
@@ -1,3 +1,9 @@
+libnss-nonlocal (1.9-0debathena2) unstable; urgency=low
+
+ * Also build a biarch lib32nss-nonlocal or lib64nss-nonlocal package.
+
+ -- Anders Kaseorg <andersk@mit.edu> Fri, 19 Jun 2009 23:54:38 -0400
+
libnss-nonlocal (1.9-0debathena1) unstable; urgency=low
* New upstream version.
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/control.in
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/control.in 2009-06-20 00:49:46 UTC (rev 23879)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/control.in 2009-06-20 04:40:23 UTC (rev 23880)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debathena Project <debathena@mit.edu>
Standards-Version: 3.7.2
-Build-Depends: @cdbs@
+Build-Depends: @cdbs@, gcc-multilib [amd64 i386] | gcc-4.1 (<< 4.1.2) [amd64 i386], libc6-dev-i386 [amd64], libc6-dev-amd64 [i386], lsb-release
Package: libnss-nonlocal
Architecture: any
@@ -12,3 +12,25 @@
This nsswitch module acts as a proxy for other nsswitch modules like
hesiod, but prevents non-local users from potentially gaining local
privileges by spoofing local UIDs and GIDs.
+
+Package: lib32nss-nonlocal
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: nsswitch proxy module to prevent local account spoofing (32-bit library)
+ This nsswitch module acts as a proxy for other nsswitch modules like
+ hesiod, but prevents non-local users from potentially gaining local
+ privileges by spoofing local UIDs and GIDs.
+ .
+ This package contains a 32-bit version of the library for compatibility
+ on 64-bit architectures.
+
+Package: lib64nss-nonlocal
+Architecture: i386
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: nsswitch proxy module to prevent local account spoofing (64-bit library)
+ This nsswitch module acts as a proxy for other nsswitch modules like
+ hesiod, but prevents non-local users from potentially gaining local
+ privileges by spoofing local UIDs and GIDs.
+ .
+ This package contains a 64-bit version of the library for compatibility
+ on 32-bit architectures.
Added: trunk/debathena/debathena/libnss-nonlocal/debian/lib32nss-nonlocal.install
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/lib32nss-nonlocal.install 2009-06-20 00:49:46 UTC (rev 23879)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/lib32nss-nonlocal.install 2009-06-20 04:40:23 UTC (rev 23880)
@@ -0,0 +1,2 @@
+lib32/*
+emul/ia32-linux/lib/*
Added: trunk/debathena/debathena/libnss-nonlocal/debian/lib64nss-nonlocal.install
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/lib64nss-nonlocal.install 2009-06-20 00:49:46 UTC (rev 23879)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/lib64nss-nonlocal.install 2009-06-20 04:40:23 UTC (rev 23880)
@@ -0,0 +1 @@
+lib64/*
Added: trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.install
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.install 2009-06-20 00:49:46 UTC (rev 23879)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.install 2009-06-20 04:40:23 UTC (rev 23880)
@@ -0,0 +1 @@
+lib/*
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/rules
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/rules 2009-06-20 00:49:46 UTC (rev 23879)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/rules 2009-06-20 04:40:23 UTC (rev 23880)
@@ -9,6 +9,8 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+DEB_DESTDIR = $(CURDIR)/debian/tmp/
+DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
DEB_CONFIGURE_PREFIX = /
LIBC6_VERSION := $(shell dpkg-query --showformat='$${Version}' --show libc6)
@@ -22,6 +24,39 @@
aclocal.m4:
touch $@
+DEB_BUILDDIR = $(or $(DEB_BUILDDIR_$(cdbs_curpkg)),debian/build)
+
+REAL_DEB_HOST_GNU_TYPE := $(DEB_HOST_GNU_TYPE)
+
+DEB_BUILDDIR_lib32nss-nonlocal = debian/build_32
+configure/lib32nss-nonlocal:: CC += -m32
+cleanbuilddir/lib32nss-nonlocal:: clean/lib32nss-nonlocal
+ifeq ($(shell lsb_release -is), Ubuntu)
+configure/lib32nss-nonlocal:: DEB_BUILD_GNU_TYPE = i686-linux
+configure/lib32nss-nonlocal:: DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib32"
+else
+configure/lib32nss-nonlocal:: DEB_BUILD_GNU_TYPE = i486-linux
+configure/lib32nss-nonlocal:: DEB_CONFIGURE_PREFIX = /emul/ia32-linux
+endif
+
+DEB_BUILDDIR_lib64nss-nonlocal = debian/build_64
+configure/lib64nss-nonlocal:: DEB_BUILD_GNU_TYPE = x86_64-linux
+configure/lib64nss-nonlocal:: CC += -m64 -D__x86_64__
+cleanbuilddir/lib64nss-nonlocal:: clean/lib64nss-nonlocal
+configure/lib64nss-nonlocal:: DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib64"
+
+configure/lib32nss-nonlocal configure/lib64nss-nonlocal::
+ $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS)
+
+build/lib32nss-nonlocal build/lib64nss-nonlocal::
+ +$(DEB_MAKE_INVOKE) $(DEB_MAKE_BUILD_TARGET)
+
+install/lib32nss-nonlocal install/lib64nss-nonlocal::
+ +$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET)
+
+clean/lib32nss-nonlocal clean/lib64nss-nonlocal::
+ +-$(DEB_MAKE_INVOKE) -k $(DEB_MAKE_CLEAN_TARGET)
+
clean::
rm -f aclocal.m4 config.guess config.sub install-sh ltmain.sh \
configure config.h.in missing depcomp Makefile.in
