OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Jul-2009 20:04:53
Branch: HEAD Handle: 2009072719045200
Modified files:
openpkg-src/squid31 squid31.patch squid31.spec
Log:
upgrading package: squid31 3.1.0.9 -> 3.1.0.12
Summary:
Revision Changes Path
1.2 +46 -0 openpkg-src/squid31/squid31.patch
1.5 +2 -2 openpkg-src/squid31/squid31.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/squid31/squid31.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 squid31.patch
--- openpkg-src/squid31/squid31.patch 8 May 2009 13:55:05 -0000 1.1
+++ openpkg-src/squid31/squid31.patch 27 Jul 2009 18:04:52 -0000 1.2
@@ -22,3 +22,49 @@
use_adaptation=yes
else
+Index: errors/Makefile.in
+--- errors/Makefile.in.orig 2009-07-27 02:06:07 +0200
++++ errors/Makefile.in 2009-07-27 19:47:38 +0200
+@@ -425,7 +425,7 @@
+ echo "$(INSTALL_DATA) $(srcdir)/errorpage.css
$(DESTDIR)$(DEFAULT_STYLESHEET)"; \
+ $(INSTALL_DATA) $(srcdir)/errorpage.css
$(DESTDIR)$(DEFAULT_STYLESHEET); \
+ fi ; \
+- $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)"
"$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
++ $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)"
"$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
+
+ uninstall-local:
+ for l in $(TRANSLATIONDIR) ; do \
+@@ -450,7 +450,7 @@
+ rm -f $(DESTDIR)TRANSLATORS
+
+ upgrade: install
+- $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)"
"$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/alias-upgrade" || exit 1 ;
++ $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)"
"$(DEFAULT_ERROR_DIR)" "$(srcdir)/alias-upgrade" || exit 1 ;
+
+ # undocumented hack. You can use this target to create multi-lingual
+ # error pages. For example:
+Index: errors/alias-link.sh
+--- errors/alias-link.sh.orig 2009-07-27 02:05:42 +0200
++++ errors/alias-link.sh 2009-07-27 19:48:13 +0200
+@@ -8,8 +8,9 @@
+
+ LN="${1}"
+ RM="${2}"
+-DIR="${3}"
+-ALIASFILE="${4}"
++DESTDIR="${3}"
++DIR="${4}"
++ALIASFILE="${5}"
+
+ if ! test -f ${ALIASFILE} ; then
+ echo "FATAL: Alias file ${ALIASFILE} does not exist!"
+@@ -37,7 +38,7 @@
+ # split aliases based on whitespace and create a symlink for each
+ # Remove and replace any pre-existing content/link
+ for alia in ${aliases}; do
+- ${RM} -f -r ${DIR}/${alia} || exit 1
+- ${LN} -s ${DIR}/${base} ${DIR}/${alia} || exit 1
++ ${RM} -f -r ${DESTDIR}${DIR}/${alia} || exit 1
++ ${LN} -s ${DIR}/${base} ${DESTDIR}${DIR}/${alia} || exit 1
+ done
+ done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squid31/squid31.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 squid31.spec
--- openpkg-src/squid31/squid31.spec 26 Jun 2009 17:23:04 -0000 1.4
+++ openpkg-src/squid31/squid31.spec 27 Jul 2009 18:04:52 -0000 1.5
@@ -26,7 +26,7 @@
# package version
%define V_maj 3
%define V_min 1
-%define V_rev 0.9
+%define V_rev 0.12
# package information
Name: squid31
@@ -39,7 +39,7 @@
Group: Web
License: GPL
Version: %{V_maj}.%{V_min}.%{V_rev}
-Release: 20090626
+Release: 20090727
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
