From 5f228bb59373048061dcca46863cebaac2e2859c Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 19 Jun 2009 20:56:53 -0400 Subject: [PATCH] Also build a biarch lib32nss-nonlocal or lib64nss-nonlocal package. Signed-off-by: Anders Kaseorg q --- debian/control.in | 24 +++++++++++++++++++++- debian/lib32nss-nonlocal.install | 2 ++ debian/lib64nss-nonlocal.install | 1 + debian/libnss-nonlocal.install | 1 + debian/rules | 35 ++++++++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 debian/lib32nss-nonlocal.install create mode 100644 debian/lib64nss-nonlocal.install create mode 100644 debian/libnss-nonlocal.install diff --git a/debian/control.in b/debian/control.in index 3643e3c..30f3020 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: debathena/libs Priority: optional Maintainer: Debathena Project Standards-Version: 3.7.2 -Build-Depends: @cdbs@ +Build-Depends: @cdbs@, gcc-multilib [amd64 i386], lsb-release Package: libnss-nonlocal Architecture: any @@ -12,3 +12,25 @@ Description: nsswitch proxy module to prevent local account spoofing 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. diff --git a/debian/lib32nss-nonlocal.install b/debian/lib32nss-nonlocal.install new file mode 100644 index 0000000..752ce56 --- /dev/null +++ b/debian/lib32nss-nonlocal.install @@ -0,0 +1,2 @@ +lib32/* +emul/ia32-linux/lib/* diff --git a/debian/lib64nss-nonlocal.install b/debian/lib64nss-nonlocal.install new file mode 100644 index 0000000..9017449 --- /dev/null +++ b/debian/lib64nss-nonlocal.install @@ -0,0 +1 @@ +lib64/* diff --git a/debian/libnss-nonlocal.install b/debian/libnss-nonlocal.install new file mode 100644 index 0000000..cdecab1 --- /dev/null +++ b/debian/libnss-nonlocal.install @@ -0,0 +1 @@ +lib/* diff --git a/debian/rules b/debian/rules index d6a072e..53bd2c1 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,8 @@ DEB_AUTO_UPDATE_LIBTOOL = pre 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 @@ debian/stamp-autotools-files: aclocal.m4 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 -- 2.45.0