From 9c59ae3e8775fa3ccfd04f768ec946884a072b9a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Sat, 11 Nov 2006 21:24:52 +0000 Subject: [PATCH] Added patch to fix the db schema, ebuild rewritten, removed old version, bug #138034 Package-Manager: portage-2.1.2_rc1-r5 --- sys-auth/libnss-pgsql/Manifest | 45 ++++++++---------- .../files/digest-libnss-pgsql-1.0.0 | 1 - .../files/digest-libnss-pgsql-1.3 | 1 - .../files/libnss-pgsql-1.3-gentoo.patch | 12 ----- .../files/postgres-and-glibc.patch | 35 -------------- .../libnss-pgsql/libnss-pgsql-1.0.0.ebuild | 45 ------------------ sys-auth/libnss-pgsql/libnss-pgsql-1.3.ebuild | 46 ------------------- 7 files changed, 18 insertions(+), 167 deletions(-) delete mode 100644 sys-auth/libnss-pgsql/files/digest-libnss-pgsql-1.0.0 delete mode 100644 sys-auth/libnss-pgsql/files/digest-libnss-pgsql-1.3 delete mode 100644 sys-auth/libnss-pgsql/files/libnss-pgsql-1.3-gentoo.patch delete mode 100644 sys-auth/libnss-pgsql/files/postgres-and-glibc.patch delete mode 100644 sys-auth/libnss-pgsql/libnss-pgsql-1.0.0.ebuild delete mode 100644 sys-auth/libnss-pgsql/libnss-pgsql-1.3.ebuild diff --git a/sys-auth/libnss-pgsql/Manifest b/sys-auth/libnss-pgsql/Manifest index 7a640a8a7ff0..837d584b3131 100644 --- a/sys-auth/libnss-pgsql/Manifest +++ b/sys-auth/libnss-pgsql/Manifest @@ -1,33 +1,24 @@ -MD5 ff9022f9d90622421bc695828fb31816 ChangeLog 1174 -RMD160 218d7508c69c74daf5165103cce1cd8bcf0efe29 ChangeLog 1174 -SHA256 5e21e065b650ffacc6b4542502247bd92618f85f793b6bdab13a4bf4542ac0a0 ChangeLog 1174 -MD5 9d469fca29b34e6f7bcf3b41674f3c42 files/digest-libnss-pgsql-1.0.0 70 -RMD160 bda4dafa06ecac7aa8eb9ac7c48a9f7b3ec05553 files/digest-libnss-pgsql-1.0.0 70 -SHA256 35ebcebb9858d369964944c7fea221839a624af7e201388cc80f680c62a12508 files/digest-libnss-pgsql-1.0.0 70 -MD5 8ed8398d0e5e0a1cc37f08226043d0ca files/digest-libnss-pgsql-1.3 73 -RMD160 06860cc8dd85b059a959dada8a51f1e11d4f4217 files/digest-libnss-pgsql-1.3 73 -SHA256 d78614d222f15a1d3593f8f712d583342eeca347451c6da824ace123fbe2d236 files/digest-libnss-pgsql-1.3 73 -MD5 8781a17800cb91018411055a8331002c files/digest-libnss-pgsql-1.4.0 67 -RMD160 5885a2732b2de989a293017cbe3fdf09e7262bfb files/digest-libnss-pgsql-1.4.0 67 -SHA256 d3e1885912ee3db0a17f2581f8eec2c68411b14db72c33fb73f8218677bb3bd7 files/digest-libnss-pgsql-1.4.0 67 -MD5 457b30ca5af70af48cc75dbf41225a52 files/libnss-pgsql-1.3-gentoo.patch 398 -RMD160 7c9fc36d60c97b01c578679a34aefaf54685679b files/libnss-pgsql-1.3-gentoo.patch 398 -SHA256 f1fe4d7fd5d717569c4d6d228f48b2de4da9b4931e1774d68f81ef25d1c0f8ad files/libnss-pgsql-1.3-gentoo.patch 398 +AUX libnss-pgsql-1.4.0-gentoo.patch 398 RMD160 fa9d1d6909141f6b4eaf119ca143b934eb64ca98 SHA1 ab4a62417347b0902a53aee9b9103f7789eb7624 SHA256 9c6d4f5cc7f0006ab8045a501ab07321bd4e873d278f517919f12381423cc7ae MD5 829b50543372c3f6cdf48b139c958f2a files/libnss-pgsql-1.4.0-gentoo.patch 398 RMD160 fa9d1d6909141f6b4eaf119ca143b934eb64ca98 files/libnss-pgsql-1.4.0-gentoo.patch 398 SHA256 9c6d4f5cc7f0006ab8045a501ab07321bd4e873d278f517919f12381423cc7ae files/libnss-pgsql-1.4.0-gentoo.patch 398 -MD5 f4cf9036a52e45d2a0aa66c50a691d9f files/postgres-and-glibc.patch 1289 -RMD160 0920ba8cee8ff45e4d3dff7967e936e75f7bc907 files/postgres-and-glibc.patch 1289 -SHA256 78fa23f858ad284b8d721c38deb7da79dcefec094ec9772494a289f885c5d087 files/postgres-and-glibc.patch 1289 -MD5 aeab225fec61555d5b4bb96f2f9f9921 libnss-pgsql-1.0.0.ebuild 1383 -RMD160 194acd3bc4dacfb829edea80f51f1b711f60201f libnss-pgsql-1.0.0.ebuild 1383 -SHA256 0864f637734d8661c5bb5c91e6c2053cc5bc28363463004e3f36a0bdb6f38a9f libnss-pgsql-1.0.0.ebuild 1383 -MD5 523db200ceaf85a5bf8aa43844f878ec libnss-pgsql-1.3.ebuild 1388 -RMD160 336352f206b12dbc81aaf9399f4b730230246ed6 libnss-pgsql-1.3.ebuild 1388 -SHA256 b55dfeb071548e97792a389b46fcc1eeac1f99cdfddd09371fcacc9b32782aff libnss-pgsql-1.3.ebuild 1388 -MD5 cf3566b4b857a86d09e9e0951a3a32e8 libnss-pgsql-1.4.0.ebuild 1427 -RMD160 fb320f99d07a501e492212b948f85e033421d0b9 libnss-pgsql-1.4.0.ebuild 1427 -SHA256 38ffcf7034c98e4c663c5689f8f2706bfad839814130417d9065bf46e0d695f9 libnss-pgsql-1.4.0.ebuild 1427 +AUX libnss-pgsql-1.4.0-schema.patch 811 RMD160 df15e2a5d70bf33ec19a101dfd5996fde00dedef SHA1 ba586b7feb67a1772f28d2881ebc523da9e86a58 SHA256 0ff80679cde52330ff4decdd3e739817e0ab57ecfe425dc7adb117b7bbd2f5a6 +MD5 b1a3af776ba4db664e1cb11c670f6c33 files/libnss-pgsql-1.4.0-schema.patch 811 +RMD160 df15e2a5d70bf33ec19a101dfd5996fde00dedef files/libnss-pgsql-1.4.0-schema.patch 811 +SHA256 0ff80679cde52330ff4decdd3e739817e0ab57ecfe425dc7adb117b7bbd2f5a6 files/libnss-pgsql-1.4.0-schema.patch 811 +DIST libnss-pgsql-1.4.0.tgz 244076 RMD160 88fccc1e58776916e1b258c79466b1d13cfb2bb0 SHA1 7f26df8e2a80471b5be6bc557ea78b3a1157593a SHA256 776efc43b21323380f9b1cf32b4463eddd7050d19912418ea58b856b96c9ee25 +EBUILD libnss-pgsql-1.4.0.ebuild 1607 RMD160 9d89642252cc64765cd6baf8b3eb69b6fcd93260 SHA1 83561e128cb5cf5073685740d2375ee5e99ed44b SHA256 54edb9af221dbf83af22c77384460546b71334a1ee68c7a88b18efa81dd584ad +MD5 c4b567f9390f5a8499032343a6322cd0 libnss-pgsql-1.4.0.ebuild 1607 +RMD160 9d89642252cc64765cd6baf8b3eb69b6fcd93260 libnss-pgsql-1.4.0.ebuild 1607 +SHA256 54edb9af221dbf83af22c77384460546b71334a1ee68c7a88b18efa81dd584ad libnss-pgsql-1.4.0.ebuild 1607 +MISC ChangeLog 1519 RMD160 5f49b3ca19a2e2f331d50924cd512fb9f93e7013 SHA1 fadb0f864f21f74b7cc907f067860e1df2e9d502 SHA256 f211811d687ae1bd2fc56bb79d5e6e83f9f716a8deeb20e024458420955e28ff +MD5 caac035e236b59f88be049bab747838d ChangeLog 1519 +RMD160 5f49b3ca19a2e2f331d50924cd512fb9f93e7013 ChangeLog 1519 +SHA256 f211811d687ae1bd2fc56bb79d5e6e83f9f716a8deeb20e024458420955e28ff ChangeLog 1519 +MISC metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 SHA1 f43b9a4a2a82140936f9b04e4e63b3c9a495141f SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 metadata.xml 163 SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891 metadata.xml 163 +MD5 85f07e270599cead0d8b38d1792153ab files/digest-libnss-pgsql-1.4.0 247 +RMD160 cf093678e7629db63aefb50d2bdd6bfa0f1c60b3 files/digest-libnss-pgsql-1.4.0 247 +SHA256 9e48c327217c4a1a029aed6276cabc77004eb6c0b6a4dd1d06f193a06daa9f82 files/digest-libnss-pgsql-1.4.0 247 diff --git a/sys-auth/libnss-pgsql/files/digest-libnss-pgsql-1.0.0 b/sys-auth/libnss-pgsql/files/digest-libnss-pgsql-1.0.0 deleted file mode 100644 index e86a40e1c38c..000000000000 --- a/sys-auth/libnss-pgsql/files/digest-libnss-pgsql-1.0.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 73b29c27ad0784baea985f0cf77eec48 libnss-pgsql-1.0.0.tar.gz 176959 diff --git a/sys-auth/libnss-pgsql/files/digest-libnss-pgsql-1.3 b/sys-auth/libnss-pgsql/files/digest-libnss-pgsql-1.3 deleted file mode 100644 index 0362ecd7bd51..000000000000 --- a/sys-auth/libnss-pgsql/files/digest-libnss-pgsql-1.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 8a026a909165a6c30781819af95282ad libnss-pgsql_1.3.orig.tar.gz 322950 diff --git a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.3-gentoo.patch b/sys-auth/libnss-pgsql/files/libnss-pgsql-1.3-gentoo.patch deleted file mode 100644 index 2da817f62afb..000000000000 --- a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.3-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur libnss-pgsql-1.0.0.orig/src/backend.c libnss-pgsql-1.0.0/src/backend.c ---- libnss-pgsql-1.0.0.orig/src/backend.c 2001-10-18 13:32:52.000000000 +0200 -+++ libnss-pgsql-1.0.0/src/backend.c 2003-11-28 16:14:38.000000000 +0100 -@@ -9,7 +9,7 @@ - */ - - #include "nss-pgsql.h" --#include -+#include - #include - #include - #include diff --git a/sys-auth/libnss-pgsql/files/postgres-and-glibc.patch b/sys-auth/libnss-pgsql/files/postgres-and-glibc.patch deleted file mode 100644 index 8e96fb00b71d..000000000000 --- a/sys-auth/libnss-pgsql/files/postgres-and-glibc.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nur libnss-pgsql-1.0.0.orig/conf/dbschema.sql libnss-pgsql-1.0.0/conf/dbschema.sql ---- libnss-pgsql-1.0.0.orig/conf/dbschema.sql 2001-10-22 18:06:32.000000000 +0200 -+++ libnss-pgsql-1.0.0/conf/dbschema.sql 2003-11-27 17:20:34.000000000 +0100 -@@ -7,7 +7,7 @@ - ); - - CREATE TABLE "accounts" ( -- "uid" serial NOT NULL, -+ "uid" serial UNIQUE NOT NULL, - "login" character varying(8) NOT NULL, - "passwd" character varying(30) NOT NULL, - "shell" character varying DEFAULT '/bin/bash' NOT NULL, -diff -Nur libnss-pgsql-1.0.0.orig/src/backend.c libnss-pgsql-1.0.0/src/backend.c ---- libnss-pgsql-1.0.0.orig/src/backend.c 2001-10-18 13:32:52.000000000 +0200 -+++ libnss-pgsql-1.0.0/src/backend.c 2003-11-28 16:14:38.000000000 +0100 -@@ -9,7 +9,7 @@ - */ - - #include "nss-pgsql.h" --#include -+#include - #include - #include - #include -diff -Nur libnss-pgsql-1.0.0.orig/src/interface.c libnss-pgsql-1.0.0/src/interface.c ---- libnss-pgsql-1.0.0.orig/src/interface.c 2001-10-18 13:32:53.000000000 +0200 -+++ libnss-pgsql-1.0.0/src/interface.c 2003-11-27 15:47:52.000000000 +0100 -@@ -12,6 +12,7 @@ - #include - #include - #define _LIBC -+#define NOT_IN_libc - #include - - static __libc_lock_t lock; diff --git a/sys-auth/libnss-pgsql/libnss-pgsql-1.0.0.ebuild b/sys-auth/libnss-pgsql/libnss-pgsql-1.0.0.ebuild deleted file mode 100644 index 3340305e6909..000000000000 --- a/sys-auth/libnss-pgsql/libnss-pgsql-1.0.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-pgsql/libnss-pgsql-1.0.0.ebuild,v 1.1 2005/07/02 21:59:23 flameeyes Exp $ - -inherit eutils - -DESCRIPTION="Name Service Switch module for use with PostgreSQL" -HOMEPAGE="http://sourceforge.net/projects/sysauth-pgsql" -SRC_URI="mirror://sourceforge/sysauth-pgsql/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86" -IUSE="" -DEPEND="virtual/libc - >=dev-db/postgresql-7.4-r1" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/postgres-and-glibc.patch -} - -src_compile() { - econf --libdir=/lib || die "econf failure" - emake || die "emake failure" -} - -src_install() { - make DESTDIR=${D} install || die "make install failure" - dodoc AUTHORS ChangeLog INSTALL NEWS README - insinto etc && doins conf/nss-pgsql.conf - docinto conf && dodoc conf/{dbschema.sql,nsswitch.conf} - docinto doc && dodoc doc/{nss-pgsql.{ps,sgml,txt}} -} - -pkg_postinst() { - einfo "Now create the required SQL tables in a database, eg.:" - einfo " $ zcat /usr/share/doc/${P}/conf/dbschema.sql.gz | psql dbtest" - einfo "Then edit the config file to match your need:" - einfo " /etc/nss-pgsql.conf" - einfo "Now edit /etc/nsswitch.conf to use the NSS service 'pgsql', an" - einfo "example is available here:" - einfo " /usr/share/doc/${P}/conf/nsswitch.conf.gz" -} diff --git a/sys-auth/libnss-pgsql/libnss-pgsql-1.3.ebuild b/sys-auth/libnss-pgsql/libnss-pgsql-1.3.ebuild deleted file mode 100644 index 2ff9b09a8bef..000000000000 --- a/sys-auth/libnss-pgsql/libnss-pgsql-1.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-pgsql/libnss-pgsql-1.3.ebuild,v 1.1 2005/07/02 21:59:23 flameeyes Exp $ - -inherit eutils - -DESCRIPTION="Name Service Switch module for use with PostgreSQL" -HOMEPAGE="http://sourceforge.net/projects/sysauth-pgsql" -SRC_URI="mirror://sourceforge/sysauth-pgsql/${PN}_${PV}.orig.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86" -IUSE="" -DEPEND="virtual/libc - dev-db/libpq - app-text/xmlto" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.patch -} - -src_compile() { - econf --libdir=/lib || die "econf failure" - emake || die "emake failure" -} - -src_install() { - make DESTDIR=${D} install || die "make install failure" - dodoc AUTHORS ChangeLog INSTALL NEWS README - insinto etc && doins conf/nss-pgsql.conf - docinto conf && dodoc conf/{dbschema.sql,nsswitch.conf} - docinto doc && dodoc doc/{nss-pgsql.{ps,sgml,txt}} -} - -pkg_postinst() { - einfo "Now create the required SQL tables in a database, eg.:" - einfo " $ zcat /usr/share/doc/${P}/conf/dbschema.sql.gz | psql dbtest" - einfo "Then edit the config file to match your need:" - einfo " /etc/nss-pgsql.conf" - einfo "Now edit /etc/nsswitch.conf to use the NSS service 'pgsql', an" - einfo "example is available here:" - einfo " /usr/share/doc/${P}/conf/nsswitch.conf.gz" -} -- 2.26.2