From: Alin Năstac Date: Wed, 6 Sep 2006 20:16:46 +0000 (+0000) Subject: Replace old db4* patches with a better one, which fixes broken compilation on a syste... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20d7eb8bb053acabaa2bac3c348d000ca98a208d;p=gentoo.git Replace old db4* patches with a better one, which fixes broken compilation on a system with db-4.3 or above (#146460). Package-Manager: portage-2.1-r2 --- diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest index 1651befd15df..bc3ae8bcd7f9 100644 --- a/net-proxy/squidguard/Manifest +++ b/net-proxy/squidguard/Manifest @@ -1,20 +1,42 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 5b2c185fe27302280de5bfedcbf8b51d ChangeLog 2822 +AUX blockedsites 8 RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 SHA1 d36a84e9d9f9d0296b0e8199ad27154ac6726395 SHA256 20169b61056128def8ac7b7eb393f7933362392b8d583b610b21bd3ce5c2015f MD5 127270fbe0d0bfbc141ffaf56313f3e6 files/blockedsites 8 -MD5 bca506ead890af8fe52e0fdf5e73440f files/digest-squidguard-1.2.0-r1 69 +RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 files/blockedsites 8 +SHA256 20169b61056128def8ac7b7eb393f7933362392b8d583b610b21bd3ce5c2015f files/blockedsites 8 +AUX squidGuard.conf.blocksites 192 RMD160 7831192143b0db590872d6dd41a9504ef49b5bad SHA1 a328f9b6eb6d5c27816fde8317f6b821d49d93bd SHA256 6fab8600cbc8945f94260c68a5c4743244dd35ce195edaf3da453e284c4f8f3a MD5 3e17e52277c56640bb3a9a24da57dae9 files/squidGuard.conf.blocksites 192 +RMD160 7831192143b0db590872d6dd41a9504ef49b5bad files/squidGuard.conf.blocksites 192 +SHA256 6fab8600cbc8945f94260c68a5c4743244dd35ce195edaf3da453e284c4f8f3a files/squidGuard.conf.blocksites 192 +AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b SHA1 ed963e093429e9fdf9c1fa06716781dd161d9448 SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df MD5 0c3ba4835c98256ad8ee4bf3336eb277 files/squidGuard.conf.minimal 61 -MD5 5838403ff8fe47285fdc4235a53467ba files/squidguard-1.2.0-db4.patch 685 -MD5 71814cadfec6eed3d7ee2437fdd1f0ab files/squidguard-1.2.0-db41.patch 794 -MD5 d639b977d8cfd92f19913f1d9fa12564 files/squidguard-1.2.0-db42.patch 1348 +RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b files/squidGuard.conf.minimal 61 +SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df files/squidGuard.conf.minimal 61 +AUX squidguard-1.2.0-db4.patch 1003 RMD160 f311b9e6a42c102e665df18fd2a19c44a9903f31 SHA1 9881bd515a3a4e9289a9711c36bfabd4f0abc5eb SHA256 a73a887642fe68277d751ccd039f0b9c0113e1d1c11f2674c1f81eca0390e858 +MD5 748a0b4ec590ccfbfcf75887a631f0f1 files/squidguard-1.2.0-db4.patch 1003 +RMD160 f311b9e6a42c102e665df18fd2a19c44a9903f31 files/squidguard-1.2.0-db4.patch 1003 +SHA256 a73a887642fe68277d751ccd039f0b9c0113e1d1c11f2674c1f81eca0390e858 files/squidguard-1.2.0-db4.patch 1003 +DIST squidGuard-1.2.0.tar.gz 1852737 RMD160 7c8d0f612b4e6bf459bf367fa56f309ce5cfe6e3 SHA1 8eb27b6eb85a3f8ed073b12a593a2c9ad97d7478 SHA256 6e88025d2906d635d170c53bf6ae7cc13e06839dfa2a6e5d92b5e6bb38e6ec6d +EBUILD squidguard-1.2.0-r1.ebuild 1751 RMD160 b22a621a3e0dd2723f1bd7401ad23119562ea33f SHA1 0c15b007c1fd301482abf7995898eb26825d6327 SHA256 a27e884dd4188013b424c23d3615be2d368d4c8243e2aac720a80b456decc586 +MD5 c5aaaff11bb5012968d5f4e6b47e0c12 squidguard-1.2.0-r1.ebuild 1751 +RMD160 b22a621a3e0dd2723f1bd7401ad23119562ea33f squidguard-1.2.0-r1.ebuild 1751 +SHA256 a27e884dd4188013b424c23d3615be2d368d4c8243e2aac720a80b456decc586 squidguard-1.2.0-r1.ebuild 1751 +MISC ChangeLog 3131 RMD160 187f436b5f7fae18fee1688edf1700134de6fba9 SHA1 ab9d2a68f433e0bb67b5ee1d8ca72edcd29a6941 SHA256 04ec3f4151cb05b87148689cf93c010f39f0c494b7925c009f448340112e37e3 +MD5 2a7b10c7e22d3d8c33dcdaf5d85413d1 ChangeLog 3131 +RMD160 187f436b5f7fae18fee1688edf1700134de6fba9 ChangeLog 3131 +SHA256 04ec3f4151cb05b87148689cf93c010f39f0c494b7925c009f448340112e37e3 ChangeLog 3131 +MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264 -MD5 4c9af73656606823b5ac55a2f7f98df1 squidguard-1.2.0-r1.ebuild 1874 +RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 metadata.xml 264 +SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 metadata.xml 264 +MD5 ec8ea45f424d2c3340cf2d1ea2d81317 files/digest-squidguard-1.2.0-r1 253 +RMD160 8b9dcfec3a88a47c69bbb818dab89778cb3657a9 files/digest-squidguard-1.2.0-r1 253 +SHA256 8dece5394be00ae9f361a1cfc8f6ab43ad2f8c03cd499810f55038ca4821f435 files/digest-squidguard-1.2.0-r1 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.1 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFEDKlfjG8pv1lIUX4RAkXYAKDwNJbxrGs6YiLwGSPUFsubIDM7/gCg03NI -jWaxDYjDG6jmuJV8AGFBnGA= -=8pUp +iD8DBQFE/yyo3sf9c6kjmR8RAqb1AJ4ok6uIfCwyOi9B9LOJb1i5NbY9aQCfbDjW +WXcXbWhsfEnDoqAmLPPVU+s= +=aGpk -----END PGP SIGNATURE----- diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch deleted file mode 100644 index 76a57a5f1deb..000000000000 --- a/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/sgDb.c 2004-07-04 11:36:19.020675285 +0100 -+++ src/sgDb.ok.c 2004-07-04 11:40:25.011222369 +0100 -@@ -98,13 +98,21 @@ - if(createdb) - flag = flag | DB_TRUNCATE; - if ((ret = -+#if DB_VERSION_MINOR == 1 -+ Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { -+#else - Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { -+#endif - (void) Db->dbp->close(Db->dbp, 0); - sgLogFatalError("Error db_open: %s", strerror(ret)); - } - } else { - if ((ret = -+#if DB_VERSION_MINOR == 1 -+ Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { -+#else - Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { -+#endif - sgLogFatalError("Error db_open: %s", strerror(ret)); - } - } diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db42.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db42.patch deleted file mode 100644 index bc7e567ac1a5..000000000000 --- a/net-proxy/squidguard/files/squidguard-1.2.0-db42.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- squidGuard-1.2.0/configure.in.chris 2004-08-25 02:44:38 +0000 -+++ squidGuard-1.2.0/configure.in 2004-08-25 02:46:18 +0000 -@@ -73,7 +73,8 @@ - - AC_CHECK_LIB(db,db_version,, - AC_CHECK_LIB(db,db_version_4000,, --AC_CHECK_LIB(db,db_version_4001,,[ -+AC_CHECK_LIB(db,db_version_4001,, -+AC_CHECK_LIB(db,db_version_4002,,[ - echo - echo "** The Berkley DB library is required for squidGuard" - echo " to compile. Get it from http://www.sleepycat.com" -@@ -82,7 +82,7 @@ - echo " its location. (default is $dbprefix/BerkeleyDB)" - echo - exit 1 -- ]))) -+ ])))) - - dnl Checks for header files. - AC_HEADER_STDC ---- squidGuard-1.2.0/src/sgDb.c.chris 2004-08-25 02:46:44 +0000 -+++ squidGuard-1.2.0/src/sgDb.c 2004-08-25 02:47:01 +0000 -@@ -98,7 +98,7 @@ - if(createdb) - flag = flag | DB_TRUNCATE; - if ((ret = --#if DB_VERSION_MINOR == 1 -+#if DB_VERSION_MINOR == 1 || DB_VERSION_MINOR == 2 - Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { - #else - Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { -@@ -108,7 +108,7 @@ - } - } else { - if ((ret = --#if DB_VERSION_MINOR == 1 -+#if DB_VERSION_MINOR == 1 || DB_VERSION_MINOR == 2 - Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { - #else - Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {