Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 311927 | Differences between
and this patch

Collapse All | Expand All

(-)squid-3.1.1.orig/acinclude.m4 (-1 / +1 lines)
Lines 75-81 Link Here
75
  AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
75
  AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
76
  AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
76
  AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
77
    ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
77
    ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
78
${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
78
${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
79
res=$?
79
res=$?
80
rm -f conftest.*
80
rm -f conftest.*
81
echo yes
81
echo yes
(-)squid-3.1.1.orig/configure.in (-3 / +3 lines)
Lines 16-24 Link Here
16
PRESET_LDFLAGS="$LDFLAGS"
16
PRESET_LDFLAGS="$LDFLAGS"
17
17
18
dnl Set default LDFLAGS
18
dnl Set default LDFLAGS
19
if test -z "$LDFLAGS"; then
19
dnl if test -z "$LDFLAGS"; then
20
        LDFLAGS="-g"
20
dnl         LDFLAGS="-g"
21
fi
21
dnl fi
22
22
23
dnl Check for GNU cc
23
dnl Check for GNU cc
24
AC_PROG_CC
24
AC_PROG_CC
(-)squid-3.1.1.orig/helpers/basic_auth/MSNT/confload.c (-1 / +1 lines)
Lines 27-33 Link Here
27
27
28
/* Path to configuration file */
28
/* Path to configuration file */
29
#ifndef SYSCONFDIR
29
#ifndef SYSCONFDIR
30
#define SYSCONFDIR "/usr/local/squid/etc"
30
#define SYSCONFDIR "/etc/squid"
31
#endif
31
#endif
32
#define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
32
#define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
33
33
(-)squid-3.1.1.orig/helpers/basic_auth/MSNT/msntauth.conf.default (-2 / +2 lines)
Lines 8-13 Link Here
8
server other_PDC	other_BDC	otherdomain
8
server other_PDC	other_BDC	otherdomain
9
9
10
# Denied and allowed users. Comment these if not needed.
10
# Denied and allowed users. Comment these if not needed.
11
#denyusers	/usr/local/squid/etc/msntauth.denyusers
11
#denyusers	/etc/squid/msntauth.denyusers
12
#allowusers	/usr/local/squid/etc/msntauth.allowusers
12
#allowusers	/etc/squid/msntauth.allowusers
13
13
(-)squid-3.1.1.orig/helpers/basic_auth/SMB/Makefile.am (-1 / +1 lines)
Lines 16-22 Link Here
16
## FIXME: autoconf should test for the samba path.
16
## FIXME: autoconf should test for the samba path.
17
17
18
SMB_AUTH_HELPER	= smb_auth.sh
18
SMB_AUTH_HELPER	= smb_auth.sh
19
SAMBAPREFIX=/usr/local/samba
19
SAMBAPREFIX=/usr
20
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
20
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
21
21
22
libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
22
libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
(-)squid-3.1.1.orig/helpers/basic_auth/SMB/smb_auth.sh (-2 / +2 lines)
Lines 24-30 Link Here
24
read AUTHSHARE
24
read AUTHSHARE
25
read AUTHFILE
25
read AUTHFILE
26
read SMBUSER
26
read SMBUSER
27
read SMBPASS
27
read -r SMBPASS
28
28
29
# Find domain controller
29
# Find domain controller
30
echo "Domain name: $DOMAINNAME"
30
echo "Domain name: $DOMAINNAME"
Lines 47-53 Link Here
47
  addropt=""
47
  addropt=""
48
fi
48
fi
49
echo "Query address options: $addropt"
49
echo "Query address options: $addropt"
50
dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
50
dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
51
echo "Domain controller IP address: $dcip"
51
echo "Domain controller IP address: $dcip"
52
[ -n "$dcip" ] || exit 1
52
[ -n "$dcip" ] || exit 1
53
53
(-)squid-3.1.1.orig/helpers/external_acl/session/squid_session.8 (-1 / +1 lines)
Lines 35-41 Link Here
35
.P
35
.P
36
Configuration example using the default automatic mode
36
Configuration example using the default automatic mode
37
.IP
37
.IP
38
external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
38
external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
39
.IP
39
.IP
40
acl session external session
40
acl session external session
41
.IP
41
.IP
(-)squid-3.1.1.orig/helpers/external_acl/unix_group/squid_unix_group.8 (-1 / +1 lines)
Lines 27-33 Link Here
27
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
27
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
28
matches users in group2 or group3
28
matches users in group2 or group3
29
.IP
29
.IP
30
external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
30
external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
31
.IP
31
.IP
32
acl usergroup1 external unix_group group1
32
acl usergroup1 external unix_group group1
33
.IP
33
.IP
(-)squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in (-1 / +2 lines)
Lines 17-22 Link Here
17
17
18
AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
18
AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
19
AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
19
AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
20
AM_MAINTAINER_MODE
20
AC_CONFIG_SRCDIR([squid_kerb_auth.c])
21
AC_CONFIG_SRCDIR([squid_kerb_auth.c])
21
22
22
AC_PROG_CC
23
AC_PROG_CC
Lines 467-473 Link Here
467
echo "configure: ##"
468
echo "configure: ##"
468
echo "configure: ## -----------------------------##"
469
echo "configure: ## -----------------------------##"
469
470
470
MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
471
MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
471
for ac_cv_my_cflag in $MY_CFLAGS; do
472
for ac_cv_my_cflag in $MY_CFLAGS; do
472
echo "int main()
473
echo "int main()
473
  {
474
  {
(-)squid-3.1.1.orig/lib/libTrie/acinclude.m4 (-1 / +1 lines)
Lines 11-17 Link Here
11
  AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
11
  AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
12
  AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
12
  AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
13
    ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
13
    ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
14
${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
14
${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
15
res=$?
15
res=$?
16
rm -f conftest.*
16
rm -f conftest.*
17
echo yes
17
echo yes
(-)squid-3.1.1.orig/lib/libTrie/configure.in (-2 / +2 lines)
Lines 59-66 Link Here
59
59
60
dnl set useful flags
60
dnl set useful flags
61
if test "$GCC" = "yes"; then
61
if test "$GCC" = "yes"; then
62
   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
62
   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
63
   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
63
   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
64
else
64
else
65
   TRIE_CFLAGS=
65
   TRIE_CFLAGS=
66
   TRIE_CXXFLAGS=
66
   TRIE_CXXFLAGS=
(-)squid-3.1.1.orig/src/Makefile.am (-9 / +6 lines)
Lines 638-644 Link Here
638
638
639
sysconf_DATA = \
639
sysconf_DATA = \
640
	squid.conf.default \
640
	squid.conf.default \
641
	squid.conf.documented \
642
	mime.conf.default
641
	mime.conf.default
643
642
644
data_DATA = \
643
data_DATA = \
Lines 718-725 Link Here
718
DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
717
DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
719
DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
718
DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
720
DEFAULT_PID_FILE        = $(DEFAULT_PIDFILE)
719
DEFAULT_PID_FILE        = $(DEFAULT_PIDFILE)
721
DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
720
DEFAULT_NETDB_FILE      = $(localstatedir)/run/netdb.state
722
DEFAULT_SWAP_DIR        = $(localstatedir)/cache
721
DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
723
DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
722
DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
724
DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
723
DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
725
DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
724
DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
Lines 797-809 Link Here
797
	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
796
	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
798
	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
797
	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
799
	else \
798
	else \
800
	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
799
			echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
801
	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
800
			$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
802
	fi
801
	fi
803
	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
802
	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
804
	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
803
	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
805
	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
806
	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
807
	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
804
	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
808
	$(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)`
805
	$(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)`
809
806
810
uninstall-local: squid.conf.default
807
uninstall-local: squid.conf.default
(-)squid-3.1.1.orig/src/cf.data.pre (-3 / +7 lines)
Lines 718-723 Link Here
718
acl Safe_ports port 488		# gss-http
718
acl Safe_ports port 488		# gss-http
719
acl Safe_ports port 591		# filemaker
719
acl Safe_ports port 591		# filemaker
720
acl Safe_ports port 777		# multiling http
720
acl Safe_ports port 777		# multiling http
721
acl Safe_ports port 901		# SWAT
721
acl CONNECT method CONNECT
722
acl CONNECT method CONNECT
722
NOCOMMENT_END
723
NOCOMMENT_END
723
DOC_END
724
DOC_END
Lines 867-872 Link Here
867
http_access allow localnet
868
http_access allow localnet
868
http_access allow localhost
869
http_access allow localhost
869
870
871
# Allow the localhost to have access by default
872
http_access allow localhost
873
870
# And finally deny all other access to this proxy
874
# And finally deny all other access to this proxy
871
http_access deny all
875
http_access deny all
872
NOCOMMENT_END
876
NOCOMMENT_END
Lines 4037-4047 Link Here
4037
4041
4038
NAME: cache_mgr
4042
NAME: cache_mgr
4039
TYPE: string
4043
TYPE: string
4040
DEFAULT: webmaster
4044
DEFAULT: root
4041
LOC: Config.adminEmail
4045
LOC: Config.adminEmail
4042
DOC_START
4046
DOC_START
4043
	Email-address of local cache manager who will receive
4047
	Email-address of local cache manager who will receive
4044
	mail if the cache dies.  The default is "webmaster."
4048
	mail if the cache dies.  The default is "root".
4045
DOC_END
4049
DOC_END
4046
4050
4047
NAME: mail_from
4051
NAME: mail_from
Lines 6353-6359 Link Here
6353
NAME: forwarded_for
6357
NAME: forwarded_for
6354
COMMENT: on|off|transparent|truncate|delete
6358
COMMENT: on|off|transparent|truncate|delete
6355
TYPE: string
6359
TYPE: string
6356
DEFAULT: on
6360
DEFAULT: delete
6357
LOC: opt_forwarded_for
6361
LOC: opt_forwarded_for
6358
DOC_START
6362
DOC_START
6359
	If set to "on", Squid will append your client's IP address
6363
	If set to "on", Squid will append your client's IP address
(-)squid-3.1.1.orig/src/debug.cc (-1 / +1 lines)
Lines 452-458 Link Here
452
#if HAVE_SYSLOG && defined(LOG_LOCAL4)
452
#if HAVE_SYSLOG && defined(LOG_LOCAL4)
453
453
454
    if (Debug::log_syslog)
454
    if (Debug::log_syslog)
455
        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
455
        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
456
456
457
#endif /* HAVE_SYSLOG */
457
#endif /* HAVE_SYSLOG */
458
458
(-)squid-3.1.1.orig/src/main.cc (-3 / +3 lines)
Lines 1535-1541 Link Here
1535
    if (*(argv[0]) == '(')
1535
    if (*(argv[0]) == '(')
1536
        return;
1536
        return;
1537
1537
1538
    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
1538
    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
1539
1539
1540
    if ((pid = fork()) < 0)
1540
    if ((pid = fork()) < 0)
1541
        syslog(LOG_ALERT, "fork failed: %s", xstrerror());
1541
        syslog(LOG_ALERT, "fork failed: %s", xstrerror());
Lines 1579-1585 Link Here
1579
1579
1580
        if ((pid = fork()) == 0) {
1580
        if ((pid = fork()) == 0) {
1581
            /* child */
1581
            /* child */
1582
            openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
1582
            openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
1583
            prog = xstrdup(argv[0]);
1583
            prog = xstrdup(argv[0]);
1584
            argv[0] = xstrdup("(squid)");
1584
            argv[0] = xstrdup("(squid)");
1585
            execvp(prog, argv);
1585
            execvp(prog, argv);
Lines 1587-1593 Link Here
1587
        }
1587
        }
1588
1588
1589
        /* parent */
1589
        /* parent */
1590
        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
1590
        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
1591
1591
1592
        syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
1592
        syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
1593
1593

Return to bug 311927