Use correct printf format for pointers. Keep /var/cache/polipo directory. Stable...

Package-Manager: portage-2.1.2.3

diff --git a/net-proxy/polipo/ChangeLog b/net-proxy/polipo/ChangeLog
index e2ff3f01520da24cf5d0a054d484e90b634c0582..125c74ecda47c1b9123706b8f831610e9a7507c8 100644 (file)
--- a/net-proxy/polipo/ChangeLog
+++ b/net-proxy/polipo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/polipo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.13 2007/02/12 11:13:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.14 2007/04/11 12:56:08 mrness Exp $
+
+*polipo-0.9.12-r1 (11 Apr 2007)
+
+  11 Apr 2007; Alin Năstac <mrness@gentoo.org>
+  +files/polipo-0.9.12-printf-ptr.patch, -polipo-0.9.12.ebuild,
+  +polipo-0.9.12-r1.ebuild:
+  Use correct printf format for pointers. Keep /var/cache/polipo directory.
+  Stable on amd64.
 
   12 Feb 2007; Alin Nastac <mrness@gentoo.org> files/polipo.initd:
   Check configuration at service startup.

diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest
index 71c0d69f634a5f062313c1437a15e373946a060b..1fa2b004e32254e01f7d225140f343a9cf643bba 100644 (file)
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -17,6 +17,10 @@ AUX polipo-0.9.12-gentoo.patch 1752 RMD160 c95a805956ea7a2bc7ba9d0e568293e5ca78e
 MD5 e3e1dbf17d8b19f00ef41e6d8936efae files/polipo-0.9.12-gentoo.patch 1752
 RMD160 c95a805956ea7a2bc7ba9d0e568293e5ca78e4ea files/polipo-0.9.12-gentoo.patch 1752
 SHA256 78c6e77234a03cd8878f5358959a7a43bc5eb6980c95cb5d87f43a95fd83d646 files/polipo-0.9.12-gentoo.patch 1752
+AUX polipo-0.9.12-printf-ptr.patch 6058 RMD160 221044b859a1342953c74d447b2fb5bdbbac8462 SHA1 5f75691822d0d7a2fe0d702fdb84aee4abdf4efd SHA256 b083f6af703c1a65f3f3a1362e90df975f5e7866555a7f092c28a70bea9a1b4b
+MD5 b63a71574b4bacb7b34a1e2418cc57b4 files/polipo-0.9.12-printf-ptr.patch 6058
+RMD160 221044b859a1342953c74d447b2fb5bdbbac8462 files/polipo-0.9.12-printf-ptr.patch 6058
+SHA256 b083f6af703c1a65f3f3a1362e90df975f5e7866555a7f092c28a70bea9a1b4b files/polipo-0.9.12-printf-ptr.patch 6058
 AUX polipo.crond 183 RMD160 aab536081352e9a16ddae9e2fba3e6c25ce687d0 SHA1 3fba7a15f51914f31b7c7c167f9cfba245ef1572 SHA256 2eb703bd3f4cdc7a616675ed3c924437e5ba594ac2037b3ae6292a410fac4b20
 MD5 44118bc5871d8a061e1ab1907b1c0065 files/polipo.crond 183
 RMD160 aab536081352e9a16ddae9e2fba3e6c25ce687d0 files/polipo.crond 183
@@ -36,14 +40,14 @@ EBUILD polipo-0.9.11.ebuild 1293 RMD160 a8ab18d1b1f91fbba066abb1a12b2b39db1b2f33
 MD5 80f7dfc8b4a0c35c3afc5e84a32138eb polipo-0.9.11.ebuild 1293
 RMD160 a8ab18d1b1f91fbba066abb1a12b2b39db1b2f33 polipo-0.9.11.ebuild 1293
 SHA256 6f1029419b33adc5dbe6ea6d645e2854b2c8669480f3a906e2135c37aa37d9ef polipo-0.9.11.ebuild 1293
-EBUILD polipo-0.9.12.ebuild 1293 RMD160 0c3a5d03c1f9e8068c6e9d69682a4b22f9b50829 SHA1 01b9df7da9ad523f707391e808899dbd2bdfed5b SHA256 1f867f0573d6d15b8ee947da3735c6d4202b41f6e654cb4aa36cf0b9b1171fed
-MD5 fa9b9775edf623b437ea7ae5c33494e6 polipo-0.9.12.ebuild 1293
-RMD160 0c3a5d03c1f9e8068c6e9d69682a4b22f9b50829 polipo-0.9.12.ebuild 1293
-SHA256 1f867f0573d6d15b8ee947da3735c6d4202b41f6e654cb4aa36cf0b9b1171fed polipo-0.9.12.ebuild 1293
-MISC ChangeLog 2349 RMD160 65e3e6563f41e3ee1699cbae97c7b818d377c3cf SHA1 7cb531bf3b60373c81d94bfe7a272fb1388bd044 SHA256 dad84ee29f2397faef10b6dcdd85e24ca4e263cd5af71257d0ee8559cec62217
-MD5 d375e4572b510771389c18903fad16c7 ChangeLog 2349
-RMD160 65e3e6563f41e3ee1699cbae97c7b818d377c3cf ChangeLog 2349
-SHA256 dad84ee29f2397faef10b6dcdd85e24ca4e263cd5af71257d0ee8559cec62217 ChangeLog 2349
+EBUILD polipo-0.9.12-r1.ebuild 1341 RMD160 52c55a2f280638f882144cd765fc1f77b116df72 SHA1 553691d9444acd0a193a6a2476490ded2b603732 SHA256 19ad3b27d2bf4152b76cd97983cd93acd9971a38801a6333cd73ffe28d84ff64
+MD5 0b08640881a5df4c8b40da25318a4222 polipo-0.9.12-r1.ebuild 1341
+RMD160 52c55a2f280638f882144cd765fc1f77b116df72 polipo-0.9.12-r1.ebuild 1341
+SHA256 19ad3b27d2bf4152b76cd97983cd93acd9971a38801a6333cd73ffe28d84ff64 polipo-0.9.12-r1.ebuild 1341
+MISC ChangeLog 2618 RMD160 c5f935661a3545e61d1340529fb4be113f2471af SHA1 8d53af948f0b45fe106c691d1e291c0e436d30d5 SHA256 2b88497212c2ee1a6f7d32347ed19bbfac29785070eeec0ae3440f31627feb9b
+MD5 aa123e6a4afa47d759ca6fb401a75bcb ChangeLog 2618
+RMD160 c5f935661a3545e61d1340529fb4be113f2471af ChangeLog 2618
+SHA256 2b88497212c2ee1a6f7d32347ed19bbfac29785070eeec0ae3440f31627feb9b ChangeLog 2618
 MISC metadata.xml 294 RMD160 9030115eb77480c879cc1b05acf92e90c9825330 SHA1 05e93a9bb94da1af1f7ac486d280d82dc68664fc SHA256 86f147ccac4c6a157b8e94ac26c69c07db91b435bb0ec703a332c17c1f3d1c1a
 MD5 c3de0bbc117c44cd0aad81e19a01094c metadata.xml 294
 RMD160 9030115eb77480c879cc1b05acf92e90c9825330 metadata.xml 294
@@ -54,13 +58,13 @@ SHA256 1dea0e604eb8b6623a4fd3cf1cd0822582c10029cde62267b12d50d443d2198b files/di
 MD5 2a6f4554a7059cee04852b6d7676ddfb files/digest-polipo-0.9.11 241
 RMD160 45f3066ab18f9d4cf90f655ee7d12b2ddff68206 files/digest-polipo-0.9.11 241
 SHA256 0c43968ada89e2bd577fd689fb5b59a6e2401b3b1950c2b458f066103bdf4838 files/digest-polipo-0.9.11 241
-MD5 426a97e1a5550638d42556c0a3e7b4a6 files/digest-polipo-0.9.12 241
-RMD160 3f0f8a533bf11f4b607d1d569c589f1fed03def3 files/digest-polipo-0.9.12 241
-SHA256 691e07e562193f2e16566c092e4ea07d4cfe99f0173add29634a292df1a52777 files/digest-polipo-0.9.12 241
+MD5 426a97e1a5550638d42556c0a3e7b4a6 files/digest-polipo-0.9.12-r1 241
+RMD160 3f0f8a533bf11f4b607d1d569c589f1fed03def3 files/digest-polipo-0.9.12-r1 241
+SHA256 691e07e562193f2e16566c092e4ea07d4cfe99f0173add29634a292df1a52777 files/digest-polipo-0.9.12-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF0EvgJnxX6mF440QRAuhZAKDdTv3mR+uevZ5NnmRyS+jhJi//tQCfcapi
-0vyACs/a5algDj27/Bd5UIo=
-=D47o
+iD8DBQFGHNrxJnxX6mF440QRAvEdAJ9cNoU2aRCpn49P3eoJuuW8Z7FuLgCePQes
+0373Qs2UQlx9sJrfQVmdBY0=
+=Jq2d
 -----END PGP SIGNATURE-----

diff --git a/net-proxy/polipo/files/digest-polipo-0.9.12 b/net-proxy/polipo/files/digest-polipo-0.9.12-r1
similarity index 100%
rename from net-proxy/polipo/files/digest-polipo-0.9.12
rename to net-proxy/polipo/files/digest-polipo-0.9.12-r1

diff --git a/net-proxy/polipo/files/polipo-0.9.12-printf-ptr.patch b/net-proxy/polipo/files/polipo-0.9.12-printf-ptr.patch
new file mode 100644 (file)
index 0000000..bf7a582
--- /dev/null
+++ b/net-proxy/polipo/files/polipo-0.9.12-printf-ptr.patch
@@ -0,0 +1,161 @@
+diff -Nru polipo-0.9.12.orig/atom.c polipo-0.9.12/atom.c
+--- polipo-0.9.12.orig/atom.c  2007-02-06 23:17:39.000000000 +0200
++++ polipo-0.9.12/atom.c       2007-04-11 15:42:05.000000000 +0300
+@@ -72,7 +72,7 @@
+         atomHashTable[h] = atom;
+         used_atoms++;
+     }
+-    do_log(D_ATOM_REFCOUNT, "A 0x%x %d++\n", (unsigned)atom, atom->refcount);
++    do_log(D_ATOM_REFCOUNT, "A %p %d++\n", atom, atom->refcount);
+     atom->refcount++;
+     return atom;
+ }
+@@ -132,7 +132,7 @@
+     if(atom == NULL)
+         return NULL;
+ 
+-    do_log(D_ATOM_REFCOUNT, "A 0x%x %d++\n", (unsigned)atom, atom->refcount);
++    do_log(D_ATOM_REFCOUNT, "A %p %d++\n", atom, atom->refcount);
+     assert(atom->refcount >= 1 && atom->refcount < 50000);
+     atom->refcount++;
+     return atom;
+@@ -144,7 +144,7 @@
+     if(atom == NULL)
+         return;
+ 
+-    do_log(D_ATOM_REFCOUNT, "A 0x%x %d--\n", (unsigned)atom, atom->refcount);
++    do_log(D_ATOM_REFCOUNT, "A %p %d--\n", atom, atom->refcount);
+     assert(atom->refcount >= 1 && atom->refcount < 50000);
+ 
+     atom->refcount--;
+diff -Nru polipo-0.9.12.orig/client.c polipo-0.9.12/client.c
+--- polipo-0.9.12.orig/client.c        2007-02-06 23:17:39.000000000 +0200
++++ polipo-0.9.12/client.c     2007-04-11 15:46:42.000000000 +0300
+@@ -105,8 +105,8 @@
+     connection->fd = fd;
+     connection->timeout = timeout;
+ 
+-    do_log(D_CLIENT_CONN, "Accepted client connection 0x%x\n",
+-           (unsigned)connection);
++    do_log(D_CLIENT_CONN, "Accepted client connection %p\n",
++           connection);
+ 
+     connection->flags = CONN_READER;
+ 
+@@ -236,8 +236,8 @@
+         return;
+     }
+     
+-    do_log(D_CLIENT_CONN, "Closing client connection 0x%x\n",
+-           (unsigned)connection);
++    do_log(D_CLIENT_CONN, "Closing client connection %p\n",
++           connection);
+ 
+     if(connection->flags & CONN_READER) {
+         httpSetTimeout(connection, 10);
+@@ -1714,8 +1714,8 @@
+ 
+     connection->offset = request->from;
+     httpSetTimeout(connection, 120);
+-    do_log(D_CLIENT_DATA, "Serving on 0x%x for 0x%x: offset %d len %d\n",
+-           (unsigned)connection, (unsigned)object,
++    do_log(D_CLIENT_DATA, "Serving on %p for %p: offset %d len %d\n",
++           connection, object,
+            connection->offset, len);
+     do_stream_h(IO_WRITE |
+                 (connection->te == TE_CHUNKED && len > 0 ? IO_CHUNKED : 0),
+@@ -1894,8 +1894,8 @@
+         if(len2 == 0) {
+             httpSetTimeout(connection, 120);
+             do_log(D_CLIENT_DATA, 
+-                   "Serving on 0x%x for 0x%x: offset %d len %d\n",
+-                   (unsigned)connection, (unsigned)object,
++                   "Serving on %p for %p: offset %d len %d\n",
++                   connection, object,
+                    connection->offset, len);
+             /* IO_NOTNOW in order to give other clients a chance to run. */
+             do_stream(IO_WRITE | IO_NOTNOW |
+@@ -1907,8 +1907,8 @@
+         } else {
+             httpSetTimeout(connection, 120);
+             do_log(D_CLIENT_DATA, 
+-                   "Serving on 0x%x for 0x%x: offset %d len %d + %d\n",
+-                   (unsigned)connection, (unsigned)object,
++                   "Serving on %p for %p: offset %d len %d + %d\n",
++                   connection, object,
+                    connection->offset, len, len2);
+             do_stream_2(IO_WRITE | IO_NOTNOW |
+                         (connection->te == TE_CHUNKED ? IO_CHUNKED : 0) |
+diff -Nru polipo-0.9.12.orig/http.c polipo-0.9.12/http.c
+--- polipo-0.9.12.orig/http.c  2007-02-06 23:17:39.000000000 +0200
++++ polipo-0.9.12/http.c       2007-04-11 15:44:58.000000000 +0300
+@@ -199,8 +199,8 @@
+         new = scheduleTimeEvent(secs, httpTimeoutHandler,
+                                 sizeof(connection), &connection);
+         if(!new) {
+-            do_log(L_ERROR, "Couldn't schedule timeout for connection 0x%x\n",
+-                   (unsigned)connection);
++            do_log(L_ERROR, "Couldn't schedule timeout for connection %p\n",
++                   connection);
+             return -1;
+         }
+     } else {
+diff -Nru polipo-0.9.12.orig/object.c polipo-0.9.12/object.c
+--- polipo-0.9.12.orig/object.c        2007-02-06 23:17:39.000000000 +0200
++++ polipo-0.9.12/object.c     2007-04-11 15:44:18.000000000 +0300
+@@ -268,7 +268,7 @@
+ ObjectPtr
+ retainObject(ObjectPtr object)
+ {
+-    do_log(D_REFCOUNT, "O 0x%x %d++\n", (unsigned)object, object->refcount);
++    do_log(D_REFCOUNT, "O %p %d++\n", object, object->refcount);
+     object->refcount++;
+     return object;
+ }
+@@ -276,7 +276,7 @@
+ void
+ releaseObject(ObjectPtr object)
+ {
+-    do_log(D_REFCOUNT, "O 0x%x %d--\n", (unsigned)object, object->refcount);
++    do_log(D_REFCOUNT, "O %p %d--\n", object, object->refcount);
+     object->refcount--;
+     if(object->refcount == 0) {
+         assert(!object->handlers && !(object->flags & OBJECT_INPROGRESS));
+@@ -288,7 +288,7 @@
+ void
+ releaseNotifyObject(ObjectPtr object)
+ {
+-    do_log(D_REFCOUNT, "O 0x%x %d--\n", (unsigned)object, object->refcount);
++    do_log(D_REFCOUNT, "O %p %d--\n", object, object->refcount);
+     object->refcount--;
+     if(object->refcount > 0) {
+         notifyObject(object);
+@@ -302,7 +302,7 @@
+ void 
+ lockChunk(ObjectPtr object, int i)
+ {
+-    do_log(D_LOCK, "Lock 0x%x[%d]: ", (unsigned)object, i);
++    do_log(D_LOCK, "Lock %p[%d]: ", object, i);
+     assert(i >= 0);
+     if(i >= object->numchunks)
+         objectSetChunks(object, i + 1);
+@@ -313,7 +313,7 @@
+ void 
+ unlockChunk(ObjectPtr object, int i)
+ {
+-    do_log(D_LOCK, "Unlock 0x%x[%d]: ", (unsigned)object, i);
++    do_log(D_LOCK, "Unlock %p[%d]: ", object, i);
+     assert(i >= 0 && i < object->numchunks);
+     assert(object->chunks[i].locked > 0);
+     object->chunks[i].locked--;
+@@ -467,8 +467,8 @@
+ {
+     int rc;
+ 
+-    do_log(D_OBJECT_DATA, "Adding data to 0x%x (%d) at %d: %d bytes\n",
+-           (unsigned)object, object->length, offset, len);
++    do_log(D_OBJECT_DATA, "Adding data to %p (%d) at %d: %d bytes\n",
++           object, object->length, offset, len);
+ 
+     if(len == 0)
+         return 1;

diff --git a/net-proxy/polipo/polipo-0.9.12.ebuild b/net-proxy/polipo/polipo-0.9.12-r1.ebuild
similarity index 89%
rename from net-proxy/polipo/polipo-0.9.12.ebuild
rename to net-proxy/polipo/polipo-0.9.12-r1.ebuild
index cda26fd6e4af3e82565ea99702f8aae5218c2ea6..47b497de8cbb7ffec877ef44c8a352fb936bbf24 100644 (file)
--- a/net-proxy/polipo/polipo-0.9.12.ebuild
+++ b/net-proxy/polipo/polipo-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.12.ebuild,v 1.1 2007/02/08 09:40:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/polipo-0.9.12-r1.ebuild,v 1.1 2007/04/11 12:56:08 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
@@ -24,6 +24,7 @@ src_unpack() {
        unpack ${A}
 
        epatch "${FILESDIR}/${P}-gentoo.patch"
+       epatch "${FILESDIR}/${P}-printf-ptr.patch"
 }
 
 src_compile() {
@@ -41,7 +42,7 @@ src_install() {
        exeinto /etc/cron.daily ; newexe "${FILESDIR}/polipo.crond" polipo.sh
 
        diropts -m0750 -o polipo -g polipo
-       dodir /var/cache/polipo
+       keepdir /var/cache/polipo
 }
 
 pkg_preinst() {