diff options
author | Tom Wijsman <tomwij@gentoo.org> | 2013-09-17 12:51:48 +0000 |
---|---|---|
committer | Tom Wijsman <tomwij@gentoo.org> | 2013-09-17 12:51:48 +0000 |
commit | 4456a98bfd634bdd0becfa0476e1fecfb0850624 (patch) | |
tree | 7cbf4a18fafb60f77d54c791b4f971903fadc2cb /net-proxy/squidguard/files | |
parent | Revision bump. Add systemd service unit. Add tools USE flag that install halo... (diff) | |
download | gentoo-2-4456a98bfd634bdd0becfa0476e1fecfb0850624.tar.gz gentoo-2-4456a98bfd634bdd0becfa0476e1fecfb0850624.tar.bz2 gentoo-2-4456a98bfd634bdd0becfa0476e1fecfb0850624.zip |
Version bump to 1.5_beta. EAPI 5. Dropped the patches that were applied upstream. Fixes bug #485148, reported by Manuel Rüger (mrueg).
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'net-proxy/squidguard/files')
-rw-r--r-- | net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch b/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch new file mode 100644 index 000000000000..814079764a3f --- /dev/null +++ b/net-proxy/squidguard/files/squidguard-1.5_beta-gentoo.patch @@ -0,0 +1,50 @@ +diff -Nru squidGuard-1.4.orig/Makefile.in squidGuard-1.4/Makefile.in +--- squidGuard-1.4.orig/Makefile.in 2008-05-17 18:36:44.000000000 +0000 ++++ squidGuard-1.4/Makefile.in 2009-01-10 13:02:14.000000000 +0000 +@@ -43,7 +43,7 @@ + # Dependencies for installing + # + +-install: install-build install-conf ++install: install-build + + install-conf: + @echo Installing configuration file ; +@@ -85,10 +85,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.4.orig/src/Makefile.in squidGuard-1.4/src/Makefile.in +--- squidGuard-1.4.orig/src/Makefile.in 2009-01-03 20:05:39.000000000 +0000 ++++ squidGuard-1.4/src/Makefile.in 2009-01-10 13:02:14.000000000 +0000 +@@ -110,6 +110,8 @@ + mv -f y.tab.c y.tab.c.bison + mv -f y.tab.h y.tab.h.bison + ++sg.y sg.l: ++ + # + # Dependencies for installing + # +@@ -122,8 +124,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.4.orig/src/sgDb.c squidGuard-1.4/src/sgDb.c |