diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-03-22 03:27:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-03-22 03:27:27 +0000 |
| commit | 386ac3fced8ce7fd827f575cabf060a5e883b3d0 (patch) | |
| tree | e29f5a789700276901cdac22206af93d28947d98 /sys-libs | |
| parent | Removed dying on ldap use flag and completely disabled the flag, see bug #125435 (diff) | |
| download | historical-386ac3fced8ce7fd827f575cabf060a5e883b3d0.tar.gz historical-386ac3fced8ce7fd827f575cabf060a5e883b3d0.tar.bz2 historical-386ac3fced8ce7fd827f575cabf060a5e883b3d0.zip | |
merge patches and some LDFLAGS fixes from Diego Pettenò #126977
Package-Manager: portage-2.1_pre6-r5
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/pwdb/Manifest | 21 | ||||
| -rw-r--r-- | sys-libs/pwdb/files/pwdb-0.62-build.patch | 16 | ||||
| -rw-r--r-- | sys-libs/pwdb/files/pwdb-0.62-use-gcc-as-linker.patch | 11 | ||||
| -rw-r--r-- | sys-libs/pwdb/pwdb-0.62.ebuild | 4 |
4 files changed, 24 insertions, 28 deletions
diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest index 433ef29441c8..1add288d3406 100644 --- a/sys-libs/pwdb/Manifest +++ b/sys-libs/pwdb/Manifest @@ -10,25 +10,22 @@ SHA256 9a4a42ea7f7deb2951893d7c01e7f3dcbd8416b83970eb707776ba0e901ebd21 files/di MD5 0d0c7a6216f5cf079472dfe36ea9d71c files/passwd 143 RMD160 ca859f48fde633c29a22f226ba01b4921c1463a1 files/passwd 143 SHA256 9cecaf4de9eaf61cf42c28bf1e63295a58e59e0ca0abb8fb7eaf6327201ce604 files/passwd 143 -MD5 44d26e602841b19baa6cfad9256c1c55 files/pwdb-0.62-build.patch 1379 -RMD160 206578cd3337f70bb0740c2563147d6e5f8fc0b1 files/pwdb-0.62-build.patch 1379 -SHA256 284d2d301fe7ef7d0aa0ce5d1726abf9e9395a0a9f653e67f78215c38b246fdf files/pwdb-0.62-build.patch 1379 +MD5 08722125d40325933e8eb6e0e1ff27d3 files/pwdb-0.62-build.patch 1732 +RMD160 a1f7e8ee17e3847a3d5a0a4948f4297b21f7d307 files/pwdb-0.62-build.patch 1732 +SHA256 e064ceb740f55dd4f8d7f8409119d85df9c34ec653f5da84da9675170da70357 files/pwdb-0.62-build.patch 1732 MD5 abb34f8a3c5a8dc43aed5a7a4eb92488 files/pwdb-0.62-selinux.patch 10480 RMD160 44e6948bdd29c5febc0ad34e488d62912c64e07d files/pwdb-0.62-selinux.patch 10480 SHA256 ab12a8d6ee52c98281e3e7f2d2eab1c95f1e4fddf3a22e3b97ec054eda7a38e4 files/pwdb-0.62-selinux.patch 10480 -MD5 4f771531dffd4c3a0e43a96e8c265f1e files/pwdb-0.62-use-gcc-as-linker.patch 421 -RMD160 da874293e65b98e610400fb47eb69b326639ee3c files/pwdb-0.62-use-gcc-as-linker.patch 421 -SHA256 6b660e65a3d201ce3f22ac2fc439eb44488e27cbf331395de52ba0f49d56fe86 files/pwdb-0.62-use-gcc-as-linker.patch 421 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 -MD5 293229f59de61f0bc36c4e39a6bab89d pwdb-0.62.ebuild 1684 -RMD160 9e7913dc143757b2f920a2b1868c28c79be561e3 pwdb-0.62.ebuild 1684 -SHA256 ea399bb1dd1ed35de0ddbf3e42944965fecc3862c7d74175c577263104fb2e58 pwdb-0.62.ebuild 1684 +MD5 500feeb849ca9e16aa2f4de16e75e691 pwdb-0.62.ebuild 1568 +RMD160 38826f24ed1824c9297e843414293a7bdac37b9c pwdb-0.62.ebuild 1568 +SHA256 7670c3120eeec01a3aa52c1a7d2493c3426781ebc42d5b1578bc6a544abba66d pwdb-0.62.ebuild 1568 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEHRDp2+ySkm8kpY0RArGAAJ9JfSqEHNrChP0VNpnC6MmZB3GypQCdEIzK -AoLmRTqYiY/FxkVAyZa6ouc= -=LusS +iD8DBQFEIMRS2+ySkm8kpY0RAnPlAJwLRKO8+wStVo26FsJqkL0bpa25DACgslIA +ODa7N3zYdSZ2HgOLiWb1CA0= +=mR75 -----END PGP SIGNATURE----- diff --git a/sys-libs/pwdb/files/pwdb-0.62-build.patch b/sys-libs/pwdb/files/pwdb-0.62-build.patch index 5e91d96209e8..78bd15caed8d 100644 --- a/sys-libs/pwdb/files/pwdb-0.62-build.patch +++ b/sys-libs/pwdb/files/pwdb-0.62-build.patch @@ -1,11 +1,23 @@ - drop ldconfig junk - - add missing headers - - add missing comma to supp_entry + +http://bugs.gentoo.org/126977 + - respect user LDFLAGS http://bugs.gentoo.org/126695 + - add missing headers + - add missing comma to supp_entry --- libpwdb/Makefile +++ libpwdb/Makefile +@@ -50,7 +50,7 @@ + + + $(LIBDYNAME): $(LIBOBJ) +- $(LD) -soname $(LIBSONAME) -x -shared -o $(LIBFILENAME) $(LIBOBJ) -lcrypt -lnsl -lc ++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,$(LIBSONAME) -Wl,-x -o $(LIBFILENAME) $(LIBOBJ) -lcrypt -lnsl -lc + @ln -sf $(LIBFILENAME) $@ + + $(LIBSTATIC): $(LIBOBJ) @@ -69,7 +69,7 @@ $(INSTALL) -m 644 radius.h $(INCLUDED)/radius.h $(INSTALL) -m 644 _pwdb_macros.h $(INCLUDED)/_pwdb_macros.h diff --git a/sys-libs/pwdb/files/pwdb-0.62-use-gcc-as-linker.patch b/sys-libs/pwdb/files/pwdb-0.62-use-gcc-as-linker.patch deleted file mode 100644 index 84a4c6bd6f7f..000000000000 --- a/sys-libs/pwdb/files/pwdb-0.62-use-gcc-as-linker.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pwdb-0.62/libpwdb/Makefile 2003-03-24 09:42:42.000000000 +0000 -+++ pwdb-0.62/libpwdb/Makefile 2003-03-24 09:34:04.000000000 +0000 -@@ -50,7 +50,7 @@ - - - $(LIBDYNAME): $(LIBOBJ) -- $(LD) -soname $(LIBSONAME) -x -shared -o $(LIBFILENAME) $(LIBOBJ) -lcrypt -lnsl -lc -+ $(CC) -shared -Wl,-soname -Wl,$(LIBSONAME) -Wl,-x -o $(LIBFILENAME) $(LIBOBJ) -lcrypt -lnsl -lc - @ln -sf $(LIBFILENAME) $@ - - $(LIBSTATIC): $(LIBOBJ) diff --git a/sys-libs/pwdb/pwdb-0.62.ebuild b/sys-libs/pwdb/pwdb-0.62.ebuild index b185d15e7fbd..b3d5f9ed094c 100644 --- a/sys-libs/pwdb/pwdb-0.62.ebuild +++ b/sys-libs/pwdb/pwdb-0.62.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.23 2006/02/12 21:53:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.24 2006/03/22 03:27:26 vapier Exp $ inherit eutils flag-o-matic @@ -21,8 +21,6 @@ src_unpack () { cd "${S}" epatch "${FILESDIR}"/${P}-build.patch - # Uses gcc as linker needed for hppa, but good idea in general. - epatch "${FILESDIR}"/${P}-use-gcc-as-linker.patch use selinux && epatch "${FILESDIR}"/${P}-selinux.patch |