Fix building on systems without utmpx.h.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 46 insertions, 22 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 8803b4b323d2..773060ca7f0c 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.306 2012/03/28 22:29:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.307 2012/04/23 23:30:13 vapier Exp $
+
+  23 Apr 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/sudo-1.8.3_p1-no-utmpx.patch, sudo-1.8.3_p2.ebuild,
+  sudo-1.8.4_p2.ebuild, sudo-1.8.4_p4.ebuild:
+  Fix building on systems without utmpx.h.
 
   28 Mar 2012; Mike Frysinger <vapier@gentoo.org>
   -files/sudo-1.8.2-fix-pwutil-alignment.patch,
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 9fd6123ddf29..ceeb3c8f894c 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA1
 
 AUX sudo-1.8.3_p1-linguas.patch 1004 RMD160 ba9f5d2ac57ed53de0388da02d29ef3e84a7b4fd SHA1 0d6d629e11eda546e1a9486bc93ede54b8019fe1 SHA256 68687a3817c8ca38802c93cbbdf24ad7fde8ef4515da691929362e85a14336ec
+AUX sudo-1.8.3_p1-no-utmpx.patch 420 RMD160 33c3ba72bc93d0d29ace9c55166fc1a627d684fc SHA1 3c36d2c91f2626170063e9be38a30bf493890822 SHA256 c75fbdae9ed523cd96b26ea06b663d24279a6ac0b213a0504c1cc8b70ceb300e
 DIST sudo-1.8.3p2.tar.gz 1536943 RMD160 5a6b8574d2245cc89d2ac982eae9cb6ca2414033 SHA1 37d70b133f809116ce631229fa0e727d9f5125ad SHA256 7edcf02ef4dc4f26f524726e8faaa90d7939772c186409ab150d2934e3a9ba31
 DIST sudo-1.8.4p2.tar.gz 1608580 RMD160 62c52bf05ac4a236e7cdf56c15cc271928635d85 SHA1 949c39a0191584ded1044a0f729d54a8dc7b3e72 SHA256 b1310b8548db5ea92f3063011c0fe6e843a1f95f548a4aeae54bcc2fdfea88a9
 DIST sudo-1.8.4p4.tar.gz 1608969 RMD160 02875946f3bb9a40637efde20c1a9a3f0b0cfca8 SHA1 49373706709bd4c30d9b3c513eff7be04aecd812 SHA256 bf965b09bde9b0cf7fd2355c53a81884d02d522af2d539cf40218436e9a5051e
-EBUILD sudo-1.8.3_p2.ebuild 4901 RMD160 19759297aeb2f1d0b0ec849032d52a56b0fbe86f SHA1 af073c081fcc8cf8099ea45275226be9e4c732da SHA256 eaed00db933deac05e2554f72208842741a57864f22d8ed975205ad63bc7aa08
-EBUILD sudo-1.8.4_p2.ebuild 4865 RMD160 1eac12234da0914cf4e04f448f3cae8f92263443 SHA1 ec3d7243739ba592579abc64a983248943169a24 SHA256 baa2673fd738a4966c6dff486b2fdbcf767cadb1a48cd3d9d4d859f7222b03ee
-EBUILD sudo-1.8.4_p4.ebuild 4865 RMD160 a0801f59c6df68cf6188cc140c64b6c017ed4dac SHA1 d1f3e975cb5e772d539780320bb727d4bdb427fe SHA256 82fe5663ccd8d5cacf047636ab7794e1bf7d93161b4368e84ddab9bd619ce4bf
-MISC ChangeLog 44747 RMD160 f8ac750c9a9f1d8924431856a0ea4ca0ec664470 SHA1 854b6634d857af0b24051e951c38ca801109f098 SHA256 510a84cd3ae6d5987c15a709e43b3540e176e0b1f72b1a3b88faf6dcb4d15c9c
+EBUILD sudo-1.8.3_p2.ebuild 4954 RMD160 5935ba8549246709c716b3c4cba4fe7fca1e82a5 SHA1 ade45f010bda743134fd004e55ae0f8e97881952 SHA256 992271224d012eef8c90c148ca2a77635acebceaf80f627d32e5a65fa2a6e058
+EBUILD sudo-1.8.4_p2.ebuild 4914 RMD160 6fe99461b9d7cf2ace0b78b437c9d153cef55278 SHA1 2cd2cc22e03783d0eaa739b686fa0296471ef12f SHA256 a2495c41b3927d8a034983c59bca2d8bf41820af84f8334be7860314ddd71512
+EBUILD sudo-1.8.4_p4.ebuild 4914 RMD160 34cc9e28efbab73369cf0352a20ea60cea2ae68e SHA1 5021732a995607277a3729d512ea5927dcc1bc2e SHA256 067f5ba1bbeb3abb67883678f4f0e0b9fcb03a29bde39cab30b79373e56b371b
+MISC ChangeLog 44948 RMD160 fd18e545948a837387240f7e10082e6627ca038d SHA1 c60b6ebafcc678dd9ca655ea2038fb5620e889b4 SHA256 33b73e72477e6695d5878f1c71cdbabcb81e171ce09a51bbfaa4d78b5406d2b5
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPc5DVAAoJELEHsLL7fEFWLWEP/1sE6MypmsDyGDjbPTe08ybZ
-JyC898TEAzY6bn2julXybgj4AuBYPXEkFy+BzYtrKk1QmbmhQWEoOC3UxWeKANsD
-vAoKbwtEWBCmExFnRTuNxiN5yda1R1Roha/QKBeOCBQzvdSoUHQZ89x2MeGhphqg
-ff48ocnsdm4HxWOsQowQ/OQRNllKUsxA9+m456c7J6FJaZ09tchlyY4iPk6KOhSm
-LeDBK3ezzF8ErKejXEBj2CX4vzMzGMyUeLUC8YU8ns5eIUqyBTUkPimN44I7SLaw
-j/jHrL9iPbS+8vVqgsvX6Y5rlLsEO/jyIGyN4RIepXkXmotxPEuGHKw+5+MUr+4e
-nzcHe6/f1gMUVQV1iGupAD78Mby3fBL9bao0b1PoBqu5y+eY/JBILKQv6R9UFDl3
-xK6zFfSk0QpwD3HySkJYAlR7JjD4rKqhEAf9YWZnvvghS40cOpkMHMA07cJzfMTS
-bRoZXhWmftv74zyB7kpki3zml7eQckDz0gIYrP0UHFhCLbQYWBzeo6acfqcCD9qA
-2Qup4pDaya/N2xYtmlyPQIz1JhGKN5lWLgN8T0hho8t/JYSzILWC2skVUchYLp6W
-CduO567GxUQqdCe5yZyL2Uy0GlY8RIGS52EgiuD5dfO17L5BIZcnZxOHpTJoxHsj
-yKUJ9LAZ86T/lFo/sjsU
-=dAV3
+iQIcBAEBAgAGBQJPleZkAAoJELEHsLL7fEFWWRMP/RkMLoC4fpceqm6qPoKc3OZa
+v6wAfqw9OKBWw4oANTDsXAF+pziywl7xoea8QRGPs122QROYnconxCVE9R8Jvw/X
+bNjAc9sECFk/2LUQ8zVUwnqnTLtelVOLei23PnpNaQslPY4B/6iJm+gigZr05HaO
+xI9z3UuiWv8VRHHUq4fHMbpSn2sXP0tp6wbfKttAJ3oKIsYjhS+/UTun4ZbcZZpV
+js6P4MCQ1EwhJwShDHjquKR60ja1W9xhzNd5NtgfqJL5Wqy/hl6dJCKy1xAI7Ez9
+e9SHHfHa+8nRWifeliwI0NExAWn7YC/RLSS1zDEVnZlDioSScb3SBpksoYyC+qAu
+vDy9NGDnoySopRPYO9b0PKvomIIfIpYtC83U4AitfjnXop7GwVVNqadIEl078Hcd
+ilpbtZhik7IZ6MkEvMxjd1zZ7TCwZsevwMsaD5r0FlkikAGyushQcLN2IAFLtPwu
+9vY+64NDiFlf8eqQsPcfZsGscf742jBTu/n9m9XHjdxnZWyYd0HZE4DZM/74iZTQ
+taKu3Pk54+nWcCyAWxt49YzbIEewQn08rvb7UqE2JwgORvxKRE66s4v9rnuYIRbL
+f9ndgbmrEKwuJITeVAfXWFrC7CuYc+aweerGGtR8UHtgpuOMu3duF/UHesycIhcq
+dwPPQYMFk7AcJowdVJeW
+=GLrE
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-1.8.3_p1-no-utmpx.patch b/app-admin/sudo/files/sudo-1.8.3_p1-no-utmpx.patch
new file mode 100644
index 000000000000..1e72ed643ba1
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.8.3_p1-no-utmpx.patch
@@ -0,0 +1,15 @@
+the fallback logic doesn't even compile
+
+--- a/src/utmp.c
++++ b/src/utmp.c
+@@ -63,8 +63,8 @@
+ #if !defined(HAVE_GETUTXID) && defined(HAVE_GETUTID)
+ # define getutxline(u)	getutline(u)
+ # define pututxline(u)	pututline(u)
+-# define setutxent	setutent(u)
+-# define endutxent	endutent(u)
++# define setutxent()	setutent()
++# define endutxent()	endutent()
+ #endif /* !HAVE_GETUTXID && HAVE_GETUTID */
+ 
+ #ifdef HAVE_GETUTXID
diff --git a/app-admin/sudo/sudo-1.8.3_p2.ebuild b/app-admin/sudo/sudo-1.8.3_p2.ebuild
index ea4154ce8dde..c2cb4de80367 100644
--- a/app-admin/sudo/sudo-1.8.3_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.3_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.3_p2.ebuild,v 1.9 2012/03/03 14:37:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.3_p2.ebuild,v 1.10 2012/04/23 23:30:13 vapier Exp $
 
 EAPI="4"
 
@@ -51,6 +51,7 @@ MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.3_p1-linguas.patch
+	epatch "${FILESDIR}"/${PN}-1.8.3_p1-no-utmpx.patch
 	elibtoolize
 }
 
diff --git a/app-admin/sudo/sudo-1.8.4_p2.ebuild b/app-admin/sudo/sudo-1.8.4_p2.ebuild
index f267532da392..362b9fd7a02c 100644
--- a/app-admin/sudo/sudo-1.8.4_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.4_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.4_p2.ebuild,v 1.1 2012/02/29 16:25:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.4_p2.ebuild,v 1.2 2012/04/23 23:30:13 vapier Exp $
 
 EAPI="4"
 
@@ -50,6 +50,7 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.3_p1-no-utmpx.patch
 	elibtoolize
 }
 
diff --git a/app-admin/sudo/sudo-1.8.4_p4.ebuild b/app-admin/sudo/sudo-1.8.4_p4.ebuild
index 6f59dc7844da..0353a00a1bf9 100644
--- a/app-admin/sudo/sudo-1.8.4_p4.ebuild
+++ b/app-admin/sudo/sudo-1.8.4_p4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.4_p4.ebuild,v 1.1 2012/03/13 16:22:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.4_p4.ebuild,v 1.2 2012/04/23 23:30:13 vapier Exp $
 
 EAPI="4"
 
@@ -50,6 +50,7 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.3_p1-no-utmpx.patch
 	elibtoolize
 }