Fix #107886 and remove --with-db=no.

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 7b65d1f65d8fc255f5e235409ddf25f31fa45371..7759603f89942192e06f723cb59e323628d516e9 100644 (file)
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,24 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8cef90196c47124526c5ec05425457c9 ChangeLog 9265
+MD5 4d076ac79c3676eb22d02357791ead84 cfengine-2.1.16.ebuild 2249
+MD5 78ca953228396511baf3f7ccef97fe27 metadata.xml 984
 MD5 c116a9798a497778b145ee38980692a1 cfengine-2.1.14-r1.ebuild 2256
-MD5 7b6935177932b682ae3a53cd2e6a9cc3 metadata.xml 977
 MD5 55b5cd09421554e49815035eda48164c cfengine-2.1.15-r1.ebuild 2250
-MD5 0fc2e52b014b73ecd1ecf09bac0aba53 cfengine-2.1.14.ebuild 2063
-MD5 047b3a63d198f4bf3902d25b49896cef cfengine-2.1.13.ebuild 2062
-MD5 c18fb5ce7e2a5e8bc526c88ae3904305 ChangeLog 8940
-MD5 a9aa786ac4c8e32d55d8469af8ddf29b files/cfengine-2.1.10-setnetgrent.patch 1037
-MD5 815d5e5ddde6c8fda9da1dbd529181aa files/digest-cfengine-2.1.14 68
-MD5 e34708413b735ba7b5402ee47b2bb62d files/digest-cfengine-2.1.13 68
+MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
 MD5 ade9e66709bdb04df3f0beba72f3a008 files/module-cfportage.tbz2 3099
+MD5 d07b5988a1635858506b57b2350b5f02 files/digest-cfengine-2.1.16 68
 MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
 MD5 815d5e5ddde6c8fda9da1dbd529181aa files/digest-cfengine-2.1.14-r1 68
-MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
 MD5 1781d04ce20330f0e9b266753eff4c91 files/digest-cfengine-2.1.15-r1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC8qUgIKl8Uu19MoRAq5EAJ45xP+/l9JKyLzrPBGKo+JJMEXMygCfQNOy
-6W/+2nYhWbHYgvwPsimiYhY=
-=SKbb
------END PGP SIGNATURE-----

diff --git a/net-misc/partysip/ChangeLog b/net-misc/partysip/ChangeLog
index 7b7bafa4658dd6985d07f1e2c74629b6214832b5..153859890aad010bb168ec3664224a73222384c4 100644 (file)
--- a/net-misc/partysip/ChangeLog
+++ b/net-misc/partysip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/partysip
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.11 2005/10/02 18:00:09 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.12 2005/10/02 18:23:00 stkn Exp $
+
+  02 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/partysip-2.2.3-fix_auth.diff, partysip-2.2.3.ebuild:
+  Remove unused code in auth plugin, breaks authentication otherwise
+  (#107886), thanks to White_Angel@gmx.de for submitting this fix. Using
+  --with-db=no does not work, fix that too.
 
   02 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
   +files/partysip-2.2.3-libresolv-check.diff, partysip-2.2.3.ebuild:

diff --git a/net-misc/partysip/Manifest b/net-misc/partysip/Manifest
index d07202f748f7aab398f87437a03cda102671352e..8314988d7350a32ce2abb3258a7a7b0358b853d7 100644 (file)
--- a/net-misc/partysip/Manifest
+++ b/net-misc/partysip/Manifest
@@ -1,7 +1,8 @@
-MD5 16a355dc83c51b768ae95ef57377b2de partysip-2.2.3.ebuild 1960
+MD5 9ee0fce746351dda580145dd25e1aee9 partysip-2.2.3.ebuild 2058
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 33bfa4684595735fb8d30b23b2e4f60a ChangeLog 1938
+MD5 f512ef6e7278964481835f22b2ffff37 ChangeLog 2236
 MD5 af1cd5cfc31c0ad22707ebfb4c5d4a42 files/partysip.confd 51
+MD5 24abad771636387287f7b64ae4d5d77b files/partysip-2.2.3-fix_auth.diff 568
 MD5 683b0ac31fb45361c565e39861b10edb files/partysip-2.2.3-configure.diff 1121
 MD5 28c1c4c474314301b9ae5a6df3bd96d8 files/digest-partysip-2.2.3 66
 MD5 3d8b82c59417e2b2174a12728fe8ce10 files/partysip.rc6 556

diff --git a/net-misc/partysip/files/partysip-2.2.3-fix_auth.diff b/net-misc/partysip/files/partysip-2.2.3-fix_auth.diff
new file mode 100644 (file)
index 0000000..ada1379
--- /dev/null
+++ b/net-misc/partysip/files/partysip-2.2.3-fix_auth.diff
@@ -0,0 +1,19 @@
+--- partysip-2.2.3/plugin/auth/auth.c.orig     2005-10-02 20:13:36.000000000 +0000
++++ partysip-2.2.3/plugin/auth/auth.c  2005-10-02 20:13:55.000000000 +0000
+@@ -65,15 +65,13 @@
+   /* find the pending_auth element */
+   char *response;
+   char *nonce;
+-  char *opaque;
+   char *realm;
+ 
+   /* char *qop; */
+   char *uri;
+ 
+   nonce = osip_proxy_authorization_get_nonce (p_auth);
+-  opaque = osip_proxy_authorization_get_opaque (p_auth);
+-  if (opaque == NULL || nonce == NULL)
++  if (nonce == NULL)
+     return -1;
+ 
+   realm = osip_proxy_authorization_get_realm (p_auth);

diff --git a/net-misc/partysip/partysip-2.2.3.ebuild b/net-misc/partysip/partysip-2.2.3.ebuild
index 6f76ef9c2524f1deb0301afe8bf02636b6c3c9d0..47bd594be1b8a924120e51ebe7bed389feb957b1 100644 (file)
--- a/net-misc/partysip/partysip-2.2.3.ebuild
+++ b/net-misc/partysip/partysip-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.2.3.ebuild,v 1.3 2005/10/02 18:00:09 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.2.3.ebuild,v 1.4 2005/10/02 18:23:00 stkn Exp $
 
 IUSE="berkdb debug syslog"
 
@@ -17,7 +17,6 @@ KEYWORDS="~ppc ~sparc ~x86"
 DEPEND="virtual/libc
        >=net-libs/libosip-2.2.1
        berkdb? ( =sys-libs/db-3* )"
-#      gdbm? ( sys-libs/gdbm )"
 
 src_unpack() {
        unpack ${A}
@@ -31,6 +30,10 @@ src_unpack() {
        # list of libresolv on amd64
        epatch ${FILESDIR}/${P}-libresolv-check.diff
 
+       # remove unused check in auth plugin (#107886)
+       # breaks authentication otherwise
+       epatch ${FILESDIR}/${P}-fix_auth.diff
+
        # put partysip  binary into /usr/sbin
        sed -i -e "s:^bin_PROGRAMS:sbin_PROGRAMS:" \
                src/Makefile.am tools/Makefile.am
@@ -48,8 +51,8 @@ src_compile() {
                myconf="--with-db=susedb3"
 #      elif use gdbm; then
 #              myconf="--with-db=gdbm"
-       else
-               myconf="--with-db=no"
+#      else
+#              myconf="--with-db=no"
        fi
 
        econf \