gcc-3.3 fixes, bug #21213

4 files changed, 110 insertions, 3 deletions

diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index fbb45901d4e2..ceee0d1c8cf1 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,11 +1,10 @@
-MD5 b9e3677397a79b1bb0f3047b8251668e ChangeLog 2604
+MD5 212f9168648a58eb44a3b27ff7a70c4a ChangeLog 2849
 MD5 cad011cbd985a979f997fcc4d8bd304c pam-login-3.6-r1.ebuild 1833
 MD5 b04418a06d1f88d40e33887a0a19ba82 pam-login-3.6-r2.ebuild 1939
 MD5 5739c21cb2f366c515850e7ee5b97eb8 pam-login-3.7.ebuild 1985
 MD5 80ca224367493f43b14bdf6a6087ec0c pam-login-3.10.ebuild 1993
 MD5 41238d6b3d0166553560500661be140c pam-login-3.11.ebuild 2294
-MD5 f26ecf97d8b6eed5876fe5b079dacb43 pam-login-3.11-r1.ebuild 2411
-MD5 4ab59e5d066cc2ea0c89e460e9775cdb .pam-login-3.11-r1.ebuild.swp 12288
+MD5 260506f937521a280aca8b0028fdda64 pam-login-3.11-r1.ebuild 2414
 MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r1 66
 MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r2 66
 MD5 7febd6315d85fcd5196b602732789573 files/digest-pam-login-3.7 66
diff --git a/sys-apps/pam-login/files/digest-pam-login-3.11-r1 b/sys-apps/pam-login/files/digest-pam-login-3.11-r1
new file mode 100644
index 000000000000..ff30d88cbdeb
--- /dev/null
+++ b/sys-apps/pam-login/files/digest-pam-login-3.11-r1
@@ -0,0 +1 @@
+MD5 be12757a47d056352e94af7de4e52d30 pam_login-3.11.tar.bz2 131529
diff --git a/sys-apps/pam-login/files/pam-login-3.11-gcc33.patch b/sys-apps/pam-login/files/pam-login-3.11-gcc33.patch
new file mode 100644
index 000000000000..bf3115877fd6
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-3.11-gcc33.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2003-05-25 10:06:01.000000000 +1000
++++ configure	2003-05-25 10:43:21.000000000 +1000
+@@ -1689,7 +1689,7 @@
+ fi
+ 
+ 
+-EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Werror"
++EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Werror"
+ # -Wpointer-arith
+ 
+ ac_ext=c
diff --git a/sys-apps/pam-login/pam-login-3.11-r1.ebuild b/sys-apps/pam-login/pam-login-3.11-r1.ebuild
new file mode 100644
index 000000000000..9daee2366a26
--- /dev/null
+++ b/sys-apps/pam-login/pam-login-3.11-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.11-r1.ebuild,v 1.1 2003/07/13 13:03:32 azarah Exp $
+
+
+inherit gnuconfig
+
+IUSE="nls selinux"
+
+# Do we want to backup an old login.defs, and forcefully
+# install a new version?
+FORCE_LOGIN_DEFS="no"
+
+MY_PN="${PN/pam-/pam_}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+DESCRIPTION="Based on the sources from util-linux, with added pam and shadow features"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+HOMEPAGE="http://www.thkukuk.de/pam/pam_login/"
+
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	sys-libs/pam
+	>=sys-apps/shadow-4.0.2-r5
+	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Do not warn on inlining for gcc-3.3, bug #21213
+	epatch ${FILESDIR}/${P}-gcc33.patch
+
+	# Patches for selinux
+	use selinux && epatch ${FILESDIR}/${P}-selinux.diff
+}
+
+src_compile() {
+
+	# Fix configure scripts to recognize linux-mips
+	# (imports updated config.sub and config.guess)
+	gnuconfig_update
+
+	local myconf=
+	use nls ||myconf="--disable-nls"
+
+	econf ${myconf} || die
+			
+	emake || die
+}
+
+src_install() {
+	einstall rootexecbindir=${D}/bin || die 
+
+	insinto /etc
+	insopts -m0644
+
+	doins ${FILESDIR}/login.defs
+	# Also install another one that we can use to check if
+	# we need to update it if FORCE_LOGIN_DEFS = "yes"
+	[ "${FORCE_LOGIN_DEFS}" = "yes" ] \
+		&& newins ${FILESDIR}/login.defs login.defs.new
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	rm -f ${ROOT}/etc/login.defs.new
+}
+
+pkg_postinst() {
+	[ "${FORCE_LOGIN_DEFS}" != "yes" ] && return 0
+
+	ewarn "Due to a compatibility issue, ${ROOT}etc/login.defs "
+	ewarn "is being updated automatically. Your old login.defs"
+	ewarn "will be backed up as:  ${ROOT}etc/login.defs.bak"
+	echo
+
+	local CHECK1="`md5sum ${ROOT}/etc/login.defs | cut -d ' ' -f 1`"
+	local CHECK2="`md5sum ${ROOT}/etc/login.defs.new | cut -d ' ' -f 1`"
+
+	if [ "${CHECK1}" != "${CHECK2}" ]
+	then
+		cp -a ${ROOT}/etc/login.defs ${ROOT}/etc/login.defs.bak
+		mv -f ${ROOT}/etc/login.defs.new ${ROOT}/etc/login.defs
+	elif [ ! -f ${ROOT}/etc/login.defs ]
+	then
+		mv -f ${ROOT}/etc/login.defs.new ${ROOT}/etc/login.defs
+	else
+		rm -f ${ROOT}/etc/login.defs.new
+	fi
+}
+