Hello community, here is the log from the commit of package squidGuard for openSUSE:Factory checked in at 2018-02-16 21:43:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squidGuard (Old) and /work/SRC/openSUSE:Factory/.squidGuard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squidGuard" Fri Feb 16 21:43:46 2018 rev:28 rq:577042 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/squidGuard/squidGuard.changes 2017-10-06 11:03:50.681765498 +0200 +++ /work/SRC/openSUSE:Factory/.squidGuard.new/squidGuard.changes 2018-02-16 21:43:46.969012460 +0100 @@ -1,0 +2,9 @@ +Thu Feb 15 11:13:36 UTC 2018 - [email protected] + +- Enable LDAP support (bnc#1081012) +- type_fixes.patch: Actually define functions so use use correct + pointer sizes on 64-bit arches once LDAP support is enabled. +- Minor specfile and description cleanup +- Fix building on SLE12 by removing useless BR: on lynx + +------------------------------------------------------------------- New: ---- type_fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squidGuard.spec ++++++ --- /var/tmp/diff_new_pack.gNcf99/_old 2018-02-16 21:43:48.292964712 +0100 +++ /var/tmp/diff_new_pack.gNcf99/_new 2018-02-16 21:43:48.296964567 +0100 @@ -1,7 +1,7 @@ # # spec file for package squidGuard # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,6 +43,7 @@ Patch7: xss_fix_02_2015.patch Patch8: squidGuard-1.4_upgrade.patch Patch9: default_config_pathfixes.patch +Patch10: type_fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: http_proxy BuildRequires: bison @@ -52,7 +53,6 @@ BuildRequires: grep BuildRequires: libmysqlclient-devel BuildRequires: libtool -BuildRequires: lynx BuildRequires: openldap2-devel Requires: http_proxy %if 0%{?suse_version} >= 1010 @@ -63,36 +63,18 @@ %endif %description -SquidGuard is a free (GPL), flexible and ultra-fast filter, redirector, -and access controller plugin for squid. It lets you define multiple -access rules with different restrictions for different user groups on a -squid cache. SquidGuard uses squid's standard redirector interface. - - - -Authors: --------- - Pål Baltzersen <[email protected]> - Lars Erik Håland <[email protected]> +SquidGuard is a filter, redirector, and access controller plugin for squid. +It lets you define multiple access rules with different restrictions for +different user groups on a squid cache. SquidGuard uses squid's +standard redirector interface. %package doc -Summary: Additional documentation and examples for %name +Summary: Documentation and examples for squidGuard Group: Documentation/Other %description doc -SquidGuard is a free (GPL), flexible and ultra-fast filter, redirector, -and access controller plugin for squid. It lets you define multiple -access rules with different restrictions for different user groups on a -squid cache. SquidGuard uses squid's standard redirector interface. - -This package contains additional scripts and documentation. - - -Authors: --------- - Pål Baltzersen <[email protected]> - Lars Erik Håland <[email protected]> - +This package contains documentation for SquidGuard, a filter, redirector, +and access controller plugin for squid. %prep %setup -q @@ -106,6 +88,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 find -type d | xargs chmod 755 cp %{SOURCE1} . # patch the test configs @@ -129,10 +112,10 @@ --with-sg-config=%{sg_config} \ --with-sg-dbhome=%{sg_dbhome} \ --with-sg-logdir=%{sg_logdir} \ - --with-ldap=%_prefix -make %{?jobs:-j%jobs} + --with-ldap +make %{?_smp_mflags} pushd contrib -make %{?jobs:-j%jobs} +make %{?_smp_mflags} popd # --------------------------------------------------------------------------- @@ -167,9 +150,6 @@ cp ANNOUNCE CHANGELOG COPYING FAQ GPL ISSUES.txt README* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ # --------------------------------------------------------------------------- -%clean -rm -rf ${RPM_BUILD_ROOT} - %files %defattr(-,root,root) %dir %{_defaultdocdir}/%{name} ++++++ type_fixes.patch ++++++ Index: squidGuard-1.4/src/sg.y.in =================================================================== --- squidGuard-1.4.orig/src/sg.y.in +++ squidGuard-1.4/src/sg.y.in @@ -20,8 +20,11 @@ %{ #include "sg.h" extern int globalDebug; +struct UserInfo *setuserinfo(); +void sgSourceUserQuery(char *query, ...); #ifdef HAVE_LIBLDAP +#define LDAP_DEPRECATED 1 #include "lber.h" #include "ldap.h" #endif @@ -667,17 +670,12 @@ void sgSourceUserList(file) /* MySQLsupport */ #ifdef HAVE_MYSQL -#if __STDC__ -void sgSourceUserQuery(char *query) -#else -void sgSourceUserQuery(query) - char *query; -#endif +void sgSourceUserQuery(char *query, ...) { char *dbhome = NULL, *f; MYSQL *conn; MYSQL_RES *res; - MYSQL_ROW *row; + MYSQL_ROW row; char line[MAX_BUF]; char *my_query, *my_user, *my_pass, *my_db; char *str=";"; @@ -2021,11 +2019,12 @@ void sgTimeSetAcl() for(rew = Rewrite; rew != NULL; rew = rew->next){ if(rew->time != NULL){ rew->active = rew->time->active; - if(rew->within == OUTSIDE) + if(rew->within == OUTSIDE) { if(rew->active) rew->active = 0; else rew->active = 1; + } } } } Index: squidGuard-1.4/src/sgDiv.c =================================================================== --- squidGuard-1.4.orig/src/sgDiv.c +++ squidGuard-1.4/src/sgDiv.c @@ -18,6 +18,7 @@ #include "sg.h" #include "sgEx.h" +#include "HTEscape.h" /* #define METEST 8; */ Index: squidGuard-1.4/src/sg.h.in =================================================================== --- squidGuard-1.4.orig/src/sg.h.in +++ squidGuard-1.4/src/sg.h.in @@ -394,7 +394,7 @@ void sgFreePatternBuffer __P((struct s int sgRegExpMatch __P((struct sgRegExp *, char *)); char *sgRegExpSubst __P((struct sgRegExp *, char *)); -void sgDbInit __P(()); +void sgDbInit __P((struct sgDb *Db, char *file)); void sgDbLoadTextFile __P((struct sgDb *, char *, int)); void sgDbUpdate __P((struct sgDb *, char *, char *, size_t)); Index: squidGuard-1.4/src/sgDiv.c.in =================================================================== --- squidGuard-1.4.orig/src/sgDiv.c.in +++ squidGuard-1.4/src/sgDiv.c.in @@ -18,6 +18,7 @@ #include "sg.h" #include "sgEx.h" +#include "HTEscape.h" /* #define METEST 8; */ @@ -692,7 +693,7 @@ char *sgParseRedirect(redirect, req, acl struct UserInfo *userquota; if(defined(s->userDb, req->ident, (char **) &userquota) == 1){ char qbuf[150]; - sprintf(qbuf, "%d-%d-%d-%d-%d-%d", s->userquota.renew, s->userquota.seconds, userquota->status, userquota->time, userquota->last, userquota->consumed); + sprintf(qbuf, "%d-%ld-%d-%ld-%ld-%d", s->userquota.renew, (long)s->userquota.seconds, userquota->status, (long)userquota->time, (long)userquota->last, userquota->consumed); strcat(buf, qbuf); } else { strcat(buf, "noquota");
