diff options
| -rw-r--r-- | net-proxy/squidguard/ChangeLog | 10 | ||||
| -rw-r--r-- | net-proxy/squidguard/Manifest | 40 | ||||
| -rw-r--r-- | net-proxy/squidguard/files/digest-squidguard-1.2.1-r1 (renamed from net-proxy/squidguard/files/digest-squidguard-1.2.1) | 0 | ||||
| -rw-r--r-- | net-proxy/squidguard/files/squidguard-1.2.1-db4.patch | 54 | ||||
| -rw-r--r-- | net-proxy/squidguard/files/squidguard-1.2.1-gentoo.patch | 134 | ||||
| -rw-r--r-- | net-proxy/squidguard/files/squidguard-1.2.1-makefile.patch | 40 | ||||
| -rw-r--r-- | net-proxy/squidguard/squidguard-1.2.1-r1.ebuild (renamed from net-proxy/squidguard/squidguard-1.2.1.ebuild) | 11 |
7 files changed, 167 insertions, 122 deletions
diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog index 8d325ec86120..b95152bc0554 100644 --- a/net-proxy/squidguard/ChangeLog +++ b/net-proxy/squidguard/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-proxy/squidguard # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.9 2007/06/17 15:59:01 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.10 2007/06/24 10:43:34 mrness Exp $ + +*squidguard-1.2.1-r1 (24 Jun 2007) + + 24 Jun 2007; Alin Năstac <mrness@gentoo.org> + -files/squidguard-1.2.1-db4.patch, +files/squidguard-1.2.1-gentoo.patch, + -files/squidguard-1.2.1-makefile.patch, -squidguard-1.2.1.ebuild, + +squidguard-1.2.1-r1.ebuild: + Add ldap USE flag (#182725). *squidguard-1.2.1 (17 Jun 2007) diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest index 548915be9171..340075db04bc 100644 --- a/net-proxy/squidguard/Manifest +++ b/net-proxy/squidguard/Manifest @@ -17,14 +17,10 @@ AUX squidguard-1.2.0-db4.patch 1756 RMD160 363f3299f83ae318719618a8aa6167b882976 MD5 2934b894c1c9934e4e1ededec79c6bfa files/squidguard-1.2.0-db4.patch 1756 RMD160 363f3299f83ae318719618a8aa6167b882976f49 files/squidguard-1.2.0-db4.patch 1756 SHA256 bb8c327ee367d656c8a598bda57a3b253dcb9320871ac8e90829337f4c8e82e8 files/squidguard-1.2.0-db4.patch 1756 -AUX squidguard-1.2.1-db4.patch 1916 RMD160 e467271e850f41d580d1e6cb51a526f36ecaf9d7 SHA1 dc258cdf3f0414c083e205df589ae4481000cfbb SHA256 4e25edca9b033a44fb35ffc0e5b82e54a3cbc44d2ef1d64c179d997488354188 -MD5 530105ba3b413999b59f58b03e14b002 files/squidguard-1.2.1-db4.patch 1916 -RMD160 e467271e850f41d580d1e6cb51a526f36ecaf9d7 files/squidguard-1.2.1-db4.patch 1916 -SHA256 4e25edca9b033a44fb35ffc0e5b82e54a3cbc44d2ef1d64c179d997488354188 files/squidguard-1.2.1-db4.patch 1916 -AUX squidguard-1.2.1-makefile.patch 1376 RMD160 71e7cd620c0150da7f31e2c0d98f86774efde6c8 SHA1 215bbd2dd271616fcb4414d4bb61bc28a4830524 SHA256 324f5ad9c59bb03d8cd7f0447df896b284204fec38aa94353d4de8ec7648d8a2 -MD5 8493875281f71d66fd4d3ae6ea5bfdbf files/squidguard-1.2.1-makefile.patch 1376 -RMD160 71e7cd620c0150da7f31e2c0d98f86774efde6c8 files/squidguard-1.2.1-makefile.patch 1376 -SHA256 324f5ad9c59bb03d8cd7f0447df896b284204fec38aa94353d4de8ec7648d8a2 files/squidguard-1.2.1-makefile.patch 1376 +AUX squidguard-1.2.1-gentoo.patch 4137 RMD160 48bc8c0990ca0e165af0f1dc756da939f2df2f80 SHA1 727e2f15144fedeb68e52acdbd5871d31704940a SHA256 8ea7540586a974cba4afb3a9149c3436e8d3d59355f3e532de2cbfbbdc08344b +MD5 2213fd1eaf683ff05edbed2bb8ba5ea0 files/squidguard-1.2.1-gentoo.patch 4137 +RMD160 48bc8c0990ca0e165af0f1dc756da939f2df2f80 files/squidguard-1.2.1-gentoo.patch 4137 +SHA256 8ea7540586a974cba4afb3a9149c3436e8d3d59355f3e532de2cbfbbdc08344b files/squidguard-1.2.1-gentoo.patch 4137 AUX squidguard-1.2.1-tests.patch 6170 RMD160 b1eb1c2f56c75cb28cb6887182b36a6c99725013 SHA1 f22f70544aaf50d7ad5ca74c42f4c93c9587b44c SHA256 116664588ac5dfc1d41a93ab8d42c482a9f1ff069592c305cfe1c726695a1184 MD5 85a1cbad7e9cde56dc3ff720ea5f0e8b files/squidguard-1.2.1-tests.patch 6170 RMD160 b1eb1c2f56c75cb28cb6887182b36a6c99725013 files/squidguard-1.2.1-tests.patch 6170 @@ -35,14 +31,14 @@ EBUILD squidguard-1.2.0-r1.ebuild 1793 RMD160 c9344daf319fd05efeec726cde7bd224fe MD5 7c3f31e9d9779d3a39ac2e1bdfb17a0b squidguard-1.2.0-r1.ebuild 1793 RMD160 c9344daf319fd05efeec726cde7bd224febab215 squidguard-1.2.0-r1.ebuild 1793 SHA256 af86fdfc14c709843de3738956880b66e753ad9b1819c620517ceb409d373c56 squidguard-1.2.0-r1.ebuild 1793 -EBUILD squidguard-1.2.1.ebuild 1739 RMD160 937b9d9d625b93b24fa5a37dd81f799ebfb1f6da SHA1 07c3716b3009f2cf974161d9d14ea253b9f46364 SHA256 b874c1b566139dd50d1e9c45f64c4693aae2c73bf89d22b961e645ab8e87c714 -MD5 00dc1b0320dd07d94e17271509a67ca5 squidguard-1.2.1.ebuild 1739 -RMD160 937b9d9d625b93b24fa5a37dd81f799ebfb1f6da squidguard-1.2.1.ebuild 1739 -SHA256 b874c1b566139dd50d1e9c45f64c4693aae2c73bf89d22b961e645ab8e87c714 squidguard-1.2.1.ebuild 1739 -MISC ChangeLog 3840 RMD160 a791f43e5818bcbf665549416305726c59d4fa32 SHA1 9c564f421fc5e591d8cab681edcf5b3324cedac7 SHA256 fe4730700bc42ce4cd021b779819315fa1b5b3d9edfda2fb9a73d7e5e64bfe28 -MD5 0a851437c64dc6d54a55225d418a026a ChangeLog 3840 -RMD160 a791f43e5818bcbf665549416305726c59d4fa32 ChangeLog 3840 -SHA256 fe4730700bc42ce4cd021b779819315fa1b5b3d9edfda2fb9a73d7e5e64bfe28 ChangeLog 3840 +EBUILD squidguard-1.2.1-r1.ebuild 1756 RMD160 c6e3f26d9467ac7890e67776c157e80563e6b45c SHA1 b699e450ca3cadb99126a088acade98459af9da2 SHA256 6f29dd0f6b1502ae5e79f5167bc581a1346d77632d30e513124b5b06057014f1 +MD5 2e970027ed0ed5ecfb6260c18a20bcc9 squidguard-1.2.1-r1.ebuild 1756 +RMD160 c6e3f26d9467ac7890e67776c157e80563e6b45c squidguard-1.2.1-r1.ebuild 1756 +SHA256 6f29dd0f6b1502ae5e79f5167bc581a1346d77632d30e513124b5b06057014f1 squidguard-1.2.1-r1.ebuild 1756 +MISC ChangeLog 4131 RMD160 86c45ee0866131e451ec5784a91471e5eb17ee85 SHA1 02fa7697a071b6977cc3464d0ae1ae8507b24f9f SHA256 d376330ad6d057959d20d02e50f29b05d7c49b3409f601f4b5177efb2b1dddac +MD5 00a90929a1175c03f76f52d61836ed64 ChangeLog 4131 +RMD160 86c45ee0866131e451ec5784a91471e5eb17ee85 ChangeLog 4131 +SHA256 d376330ad6d057959d20d02e50f29b05d7c49b3409f601f4b5177efb2b1dddac ChangeLog 4131 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 metadata.xml 264 @@ -50,13 +46,13 @@ SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 metadata 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 -MD5 7c40dfc7cc8a264fc15132ad35c92a7d files/digest-squidguard-1.2.1 253 -RMD160 47e20f3ef4c4988bc954e45c6c312be0a18a7e87 files/digest-squidguard-1.2.1 253 -SHA256 70a44707f5483a735541fc3f8230ad36a9e41213455be81c7e655e4c2ca37193 files/digest-squidguard-1.2.1 253 +MD5 7c40dfc7cc8a264fc15132ad35c92a7d files/digest-squidguard-1.2.1-r1 253 +RMD160 47e20f3ef4c4988bc954e45c6c312be0a18a7e87 files/digest-squidguard-1.2.1-r1 253 +SHA256 70a44707f5483a735541fc3f8230ad36a9e41213455be81c7e655e4c2ca37193 files/digest-squidguard-1.2.1-r1 253 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFGdVpRJnxX6mF440QRAl2HAJ9P8GsgNoaR71T9zYaW/FXnaRjoLQCfcHwS -jUimGqsuEsUOlcsd7qQKny8= -=Ny25 +iD8DBQFGfkrgJnxX6mF440QRAjxjAKCIrIUMn3KEK7z/8hGZ/GtDIOgN8gCfcdAc +im4v3VMO9AZyPmg5JdZn6tk= +=j+xR -----END PGP SIGNATURE----- diff --git a/net-proxy/squidguard/files/digest-squidguard-1.2.1 b/net-proxy/squidguard/files/digest-squidguard-1.2.1-r1 index b8df36f399bf..b8df36f399bf 100644 --- a/net-proxy/squidguard/files/digest-squidguard-1.2.1 +++ b/net-proxy/squidguard/files/digest-squidguard-1.2.1-r1 diff --git a/net-proxy/squidguard/files/squidguard-1.2.1-db4.patch b/net-proxy/squidguard/files/squidguard-1.2.1-db4.patch deleted file mode 100644 index 25cb495bca42..000000000000 --- a/net-proxy/squidguard/files/squidguard-1.2.1-db4.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Nru squidGuard-1.2.1.orig/configure.in squidGuard-1.2.1/configure.in ---- squidGuard-1.2.1.orig/configure.in 2007-06-17 11:24:29.000000000 +0300 -+++ squidGuard-1.2.1/configure.in 2007-06-17 11:24:55.000000000 +0300 -@@ -85,7 +85,7 @@ - AC_HEADER_STDC - AC_CHECK_HEADERS(db.h regex.h unistd.h) - --+AC_CHECK_HEADER(db.h,,[ -+AC_CHECK_HEADER(db.h,,[ - echo - echo "** No db.h found" - echo " The Berkley DB library is required for squidGuard" -@@ -141,15 +141,7 @@ - ]) - - dnl Check DB --AC_CHECK_LIB(db,db_version,,[ -- echo -- echo "** The Berkley DB library is required for squidGuard" -- echo " to compile. Get it from http://www.sleepycat.com" -- echo " use --with-db=DIR or --with-db-lib=DIR to specify" -- echo " its location. (default is $dbprefix/BerkeleyDB)" -- echo -- exit 1 -- ]) -+LIBS="$LIBS -ldb" - AC_RUN_IFELSE([ - #include <db.h> - int main() -diff -Nru squidGuard-1.2.1.orig/src/sgDb.c squidGuard-1.2.1/src/sgDb.c ---- squidGuard-1.2.1.orig/src/sgDb.c 2007-06-17 11:24:29.000000000 +0300 -+++ squidGuard-1.2.1/src/sgDb.c 2007-06-17 11:15:27.000000000 +0300 -@@ -101,13 +101,21 @@ - if(createdb) - flag = flag | DB_TRUNCATE; - if ((ret = -+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && 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_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && 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.1-gentoo.patch b/net-proxy/squidguard/files/squidguard-1.2.1-gentoo.patch new file mode 100644 index 000000000000..3258cb8ab4e3 --- /dev/null +++ b/net-proxy/squidguard/files/squidguard-1.2.1-gentoo.patch @@ -0,0 +1,134 @@ +diff -Nru squidGuard-1.2.1.orig/configure.in squidGuard-1.2.1/configure.in +--- squidGuard-1.2.1.orig/configure.in 2007-06-24 13:19:45.000000000 +0300 ++++ squidGuard-1.2.1/configure.in 2007-06-24 13:17:36.000000000 +0300 +@@ -85,7 +85,7 @@ + AC_HEADER_STDC + AC_CHECK_HEADERS(db.h regex.h unistd.h) + +-+AC_CHECK_HEADER(db.h,,[ ++AC_CHECK_HEADER(db.h,,[ + echo + echo "** No db.h found" + echo " The Berkley DB library is required for squidGuard" +@@ -110,13 +110,24 @@ + dnl + + dnl Check ldap +-AC_CHECK_LIB(ldap,ldap_init,,[ +- echo +- echo "LDAP library not found" +- echo +- exit 1 +- ]) +-AC_RUN_IFELSE([ ++AC_ARG_WITH(ldap, ++ AC_HELP_STRING([--with-ldap], [use ldap (default=yes)])) ++if test "$with_ldap" = "no" -o "$with_ldap" = "false" ++then ++ with_ldap=no ++else ++ AC_CHECK_LIB( ldap, ldap_init, ++ [ ++ with_ldap=yes ++ LIBS="$LIBS -lldap" ++ ],[ ++ AC_MSG_WARN([Cannot find LDAP libraries. LDAP support disabled]) ++ with_ldap=no ++ ]) ++fi ++if test "$with_ldap" = "yes"; then ++ AC_DEFINE(HAVE_LIBLDAP) ++ AC_RUN_IFELSE([ + #include <ldap.h> + int main() + { +@@ -130,6 +141,7 @@ + echo + exit 1 + ],) ++fi + + dnl Check threads... ok if it fails + AC_CHECK_LIB(pthread,pthread_create,,[ +@@ -141,15 +153,7 @@ + ]) + + dnl Check DB +-AC_CHECK_LIB(db,db_version,,[ +- echo +- echo "** The Berkley DB library is required for squidGuard" +- echo " to compile. Get it from http://www.sleepycat.com" +- echo " use --with-db=DIR or --with-db-lib=DIR to specify" +- echo " its location. (default is $dbprefix/BerkeleyDB)" +- echo +- exit 1 +- ]) ++LIBS="$LIBS -ldb" + AC_RUN_IFELSE([ + #include <db.h> + int main() +diff -Nru squidGuard-1.2.1.orig/Makefile.in squidGuard-1.2.1/Makefile.in +--- squidGuard-1.2.1.orig/Makefile.in 2007-06-24 13:09:47.000000000 +0300 ++++ squidGuard-1.2.1/Makefile.in 2007-06-24 12:55:17.000000000 +0300 +@@ -40,7 +40,7 @@ + # Dependencies for installing + # + +-install: install-build install-conf ++install: install-build + + install-conf: + @echo Installing configuration file +@@ -67,10 +67,10 @@ + + install-build: + @echo Installing squidGuard +- @if [ ! -d $(bindir) ]; then \ +- $(MKINSTALLDIRS) $(bindir) ; \ ++ @if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \ ++ $(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \ + fi ; \ +- cp src/squidGuard $(bindir) || exit 1 ; \ ++ cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ; \ + echo Done. ; + + clean:: +diff -Nru squidGuard-1.2.1.orig/src/Makefile.in squidGuard-1.2.1/src/Makefile.in +--- squidGuard-1.2.1.orig/src/Makefile.in 2007-06-24 13:09:47.000000000 +0300 ++++ squidGuard-1.2.1/src/Makefile.in 2007-06-24 12:55:17.000000000 +0300 +@@ -103,8 +103,8 @@ + + install.bin:: squidGuard + @echo making $@ in `basename \`pwd\`` +- @$(MKDIR) $(bindir) $(logdir) $(cfgdir) +- $(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard ++ @$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir) ++ $(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard + + uninstall.bin:: + @echo making $@ in `basename \`pwd\`` +diff -Nru squidGuard-1.2.1.orig/src/sgDb.c squidGuard-1.2.1/src/sgDb.c +--- squidGuard-1.2.1.orig/src/sgDb.c 2007-06-24 13:19:45.000000000 +0300 ++++ squidGuard-1.2.1/src/sgDb.c 2007-06-24 12:55:17.000000000 +0300 +@@ -101,13 +101,21 @@ + if(createdb) + flag = flag | DB_TRUNCATE; + if ((ret = ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && 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_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && 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.1-makefile.patch b/net-proxy/squidguard/files/squidguard-1.2.1-makefile.patch deleted file mode 100644 index 9ffa99971bef..000000000000 --- a/net-proxy/squidguard/files/squidguard-1.2.1-makefile.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nru squidGuard-1.2.1.orig/Makefile.in squidGuard-1.2.1/Makefile.in ---- squidGuard-1.2.1.orig/Makefile.in 2006-12-29 11:03:53.000000000 +0200 -+++ squidGuard-1.2.1/Makefile.in 2007-06-17 18:47:13.000000000 +0300 -@@ -40,7 +40,7 @@ - # Dependencies for installing - # - --install: install-build install-conf -+install: install-build - - install-conf: - @echo Installing configuration file -@@ -67,10 +67,10 @@ - - install-build: - @echo Installing squidGuard -- @if [ ! -d $(bindir) ]; then \ -- $(MKINSTALLDIRS) $(bindir) ; \ -+ @if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \ -+ $(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \ - fi ; \ -- cp src/squidGuard $(bindir) || exit 1 ; \ -+ cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ; \ - echo Done. ; - - clean:: -diff -Nru squidGuard-1.2.1.orig/src/Makefile.in squidGuard-1.2.1/src/Makefile.in ---- squidGuard-1.2.1.orig/src/Makefile.in 2007-03-16 17:58:37.000000000 +0200 -+++ squidGuard-1.2.1/src/Makefile.in 2007-06-17 18:41:35.000000000 +0300 -@@ -103,8 +103,8 @@ - - install.bin:: squidGuard - @echo making $@ in `basename \`pwd\`` -- @$(MKDIR) $(bindir) $(logdir) $(cfgdir) -- $(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard -+ @$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir) -+ $(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard - - uninstall.bin:: - @echo making $@ in `basename \`pwd\`` diff --git a/net-proxy/squidguard/squidguard-1.2.1.ebuild b/net-proxy/squidguard/squidguard-1.2.1-r1.ebuild index 4dd625ce1ff9..0a6fd1985845 100644 --- a/net-proxy/squidguard/squidguard-1.2.1.ebuild +++ b/net-proxy/squidguard/squidguard-1.2.1-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/squidguard/squidguard-1.2.1.ebuild,v 1.1 2007/06/17 15:59:01 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.1-r1.ebuild,v 1.1 2007/06/24 10:43:34 mrness Exp $ inherit eutils autotools @@ -11,10 +11,11 @@ SRC_URI="http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" +IUSE="ldap" RDEPEND="net-proxy/squid - >=sys-libs/db-2" + >=sys-libs/db-2 + ldap? ( net-nds/openldap )" DEPEND="${RDEPEND} sys-devel/bison sys-devel/flex" @@ -25,14 +26,14 @@ src_unpack() { unpack ${A} || die "unpack problem" cd "${S}" - epatch "${FILESDIR}/${P}-db4.patch" + epatch "${FILESDIR}/${P}-gentoo.patch" epatch "${FILESDIR}/${P}-tests.patch" - epatch "${FILESDIR}/${P}-makefile.patch" eautoconf } src_compile() { econf \ + $(use_with ldap) \ --with-sg-config=/etc/squidGuard/squidGuard.conf \ --with-sg-logdir=/var/log/squidGuard \ || die "configure has failed" |