pool/squid
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 184303 from server:proxy

Browse Source 
- Add patch squid-fix-pod2man-check.patch solving building with
  new perl.

OBS-URL: https://build.opensuse.org/request/show/184303
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/squid?expand=0&rev=10
This commit is contained in:
Stephan Kulow 2013-07-25 12:46:49 +00:00 committed by Git OBS Bridge
commit f682013823
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
squid-fix-pod2man-check.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urN squid-3.2.11.old/helpers/basic_auth/DB/config.test squid-3.2.11/helpers/basic_auth/DB/config.test
--- squid-3.2.11.old/helpers/basic_auth/DB/config.test 2013-07-25 12:15:59.645954336 +0200
+++ squid-3.2.11/helpers/basic_auth/DB/config.test 2013-07-25 12:16:26.881955259 +0200
@@ -2,6 +2,6 @@
## Test: do we have perl to build the helper scripts?
## Test: do we have pod2man to build the manual?
-perl --version >/dev/null && echo | pod2man >/dev/null
+perl --version >/dev/null && echo =encoding US-ASCII | pod2man >/dev/null
exit $?

6
squid.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 25 10:19:05 UTC 2013 - tchvatal@suse.com
- Add patch squid-fix-pod2man-check.patch solving building with
new perl.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 30 11:42:06 UTC 2013 - bruno@ioda-net.ch Tue Apr 30 11:42:06 UTC 2013 - bruno@ioda-net.ch

3
squid.spec
View File

@ -58,6 +58,8 @@ Patch101: %{name}-nobuilddates.patch
## File is compiled without RPM_OPT_FLAGS ## File is compiled without RPM_OPT_FLAGS
# squid3 no-rpm-opt-flags <cmdline>:./cf_gen.cc # squid3 no-rpm-opt-flags <cmdline>:./cf_gen.cc
Patch102: %{name}-compiled_without_RPM_OPT_FLAGS.patch Patch102: %{name}-compiled_without_RPM_OPT_FLAGS.patch
# Upstream notified of this problem by mageia guys
Patch103: %{name}-fix-pod2man-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq PreReq: %fillup_prereq
PreReq: %insserv_prereq PreReq: %insserv_prereq
@ -148,6 +150,7 @@ perl -p -i -e 's|/usr/local/bin/perl|/usr/bin/perl|' `find -name "*.pl"`
chmod a-x CREDITS chmod a-x CREDITS
%patch101 %patch101
%patch102 %patch102
%patch103 -p1
%build %build
export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF" export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"