Sun Nov 22 22:07:14 UTC 2009

Author: baard

Update of /cvs/pkgs/rpms/gadmin-squid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16356

Modified Files:
	.cvsignore gadmin-squid.spec sources 
Added Files:
	gadmin-squid-0.1.2-Makefile.am.patch 
	gadmin-squid-0.1.2-configure.in.patch 
	gadmin-squid-0.1.2-desktop-icon.patch 
	gadmin-squid-0.1.2-po-Makefile.in.in.patch 
	gadmin-squid-0.1.2-src-create_acl_tab.c.patch 
	gadmin-squid-0.1.2-src-create_server_tab.c.patch 
	gadmin-squid-0.1.2-src-standard.c.patch 
Removed Files:
	gadmin-squid-0.1.0-POTFILES.patch 
	gadmin-squid-0.1.0-desktop-icon.patch 
	gadmin-squid-0.1.0-desktop.patch 
Log Message:
updates to new upstream version 0.1.2

gadmin-squid-0.1.2-Makefile.am.patch:
 Makefile.am |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE gadmin-squid-0.1.2-Makefile.am.patch ---
--- gadmin-squid-0.1.2/Makefile.am	2008-02-19 23:08:02.000000000 +0100
+++ gadmin-squid-0.1.2-changed/Makefile.am	2009-11-22 19:26:14.940183875 +0100
@@ -42,11 +42,11 @@
 	if test ! -d $(DESTDIR)$(datadir)/doc/gadmin-squid; then \
 	   $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/gadmin-squid; \
 	fi;
-	if test -d $(DESTDIR)$(datadir)/doc/gadmin-squid; then \
-	   cp AUTHORS $(DESTDIR)$(datadir)/doc/gadmin-squid/; \
-	   cp README $(DESTDIR)$(datadir)/doc/gadmin-squid/; \
-	   cp ChangeLog $(DESTDIR)$(datadir)/doc/gadmin-squid/; \
-	   cp COPYING $(DESTDIR)$(datadir)/doc/gadmin-squid/; \
+	if test -d $(DESTDIR)$(docdir); then \
+	   cp AUTHORS $(DESTDIR)$(docdir); \
+	   cp README $(DESTDIR)$(docdir); \
+	   cp ChangeLog $(DESTDIR)$(docdir); \
+	   cp COPYING $(DESTDIR)$(docdir); \
 	fi;
 	if test ! -d $(DESTDIR)$(sysconfdir)/gadmin-squid; then \
 	   $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gadmin-squid; \

gadmin-squid-0.1.2-configure.in.patch:
 configure.in |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE gadmin-squid-0.1.2-configure.in.patch ---
--- gadmin-squid-0.1.2/configure.in	2009-11-10 20:35:01.000000000 +0100
+++ gadmin-squid-0.1.2-changed/configure.in	2009-11-22 20:40:16.480308918 +0100
@@ -194,6 +194,8 @@
 AC_DEFINE_UNQUOTED(GH_GSHADOW,"`eval echo "/etc/gshadow"`",[path to gshadow])
 AC_DEFINE_UNQUOTED(GH_VARDIR,"`eval echo "${localstatedir}"`",[var dir])
 
+AC_DEFINE_UNQUOTED(LIBDIR, "$libdir",[path to the library directory])
+
 
 AC_OUTPUT([
 Makefile

gadmin-squid-0.1.2-desktop-icon.patch:
 net-gadmin-squid.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gadmin-squid-0.1.2-desktop-icon.patch ---
--- gadmin-squid-0.1.2/desktop/net-gadmin-squid.desktop	2008-02-19 23:00:32.000000000 +0100
+++ gadmin-squid-0.1.2-changed/desktop/net-gadmin-squid.desktop	2009-11-22 18:06:17.900183890 +0100
@@ -16,7 +16,7 @@
 GenericName=GADMIN-SQUID
 Comment=Squid proxy server administration
 Exec=gadmin-squid
-Icon=gadmin-squid.png
+Icon=gadmin-squid
 Terminal=false
 Type=Application
 Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base;

gadmin-squid-0.1.2-po-Makefile.in.in.patch:
 Makefile.in.in |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gadmin-squid-0.1.2-po-Makefile.in.in.patch ---
--- gadmin-squid-0.1.2/po/Makefile.in.in	2004-05-29 05:01:21.000000000 +0200
+++ gadmin-squid-0.1.2-changed/po/Makefile.in.in	2009-11-22 18:51:37.256309640 +0100
@@ -26,6 +26,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
+datarootdir = @datarootdir@
 libdir = @libdir@
 localedir = $(libdir)/locale
 gnulocaledir = $(datadir)/locale

gadmin-squid-0.1.2-src-create_acl_tab.c.patch:
 create_acl_tab.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gadmin-squid-0.1.2-src-create_acl_tab.c.patch ---
--- gadmin-squid-0.1.2/src/create_acl_tab.c	2009-07-20 04:29:21.000000000 +0200
+++ gadmin-squid-0.1.2-changed/src/create_acl_tab.c	2009-11-22 21:12:51.210183856 +0100
@@ -21,6 +21,7 @@
 
 
 #include <gtk/gtk.h>
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include "widgets.h"
@@ -153,7 +154,7 @@
     /* Changes the edited cells text */
     GtkTreeIter iter;
     GtkTreePath *path = NULL;
-    int column = (int) g_object_get_data(G_OBJECT(cell), "column");
+    int column = (gint)  (glong) g_object_get_data(G_OBJECT(cell), "column");
 
     path = gtk_tree_path_new_from_string(path_string);
     gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path);
@@ -178,7 +179,7 @@
     /* Changes cell combo text */
     GtkTreeIter iter;
     GtkTreePath *path = NULL;
-    int column = (int) g_object_get_data(G_OBJECT(cell), "column");
+    int column = (gint)  (glong) g_object_get_data(G_OBJECT(cell), "column");
 
     path = gtk_tree_path_new_from_string(path_string);
     gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path);

gadmin-squid-0.1.2-src-create_server_tab.c.patch:
 create_server_tab.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gadmin-squid-0.1.2-src-create_server_tab.c.patch ---
--- gadmin-squid-0.1.2/src/create_server_tab.c	2009-07-20 04:40:54.000000000 +0200
+++ gadmin-squid-0.1.2-changed/src/create_server_tab.c	2009-11-22 21:12:31.553309053 +0100
@@ -20,6 +20,7 @@
 
 
 #include <gtk/gtk.h>
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include "widgets.h"
@@ -93,7 +94,7 @@
     /* Changes the edited cells text */
     GtkTreeIter iter;
     GtkTreePath *path = NULL;
-    int column = (int) g_object_get_data(G_OBJECT(cell), "column");
+    int column = (gint)  (glong) g_object_get_data(G_OBJECT(cell), "column");
 
     path = gtk_tree_path_new_from_string(path_string);
     gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path);

gadmin-squid-0.1.2-src-standard.c.patch:
 standard_conf.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gadmin-squid-0.1.2-src-standard.c.patch ---
--- gadmin-squid-0.1.2/src/standard_conf.c	2009-11-10 21:40:32.000000000 +0100
+++ gadmin-squid-0.1.2-changed/src/standard_conf.c	2009-11-22 20:44:32.605183524 +0100
@@ -190,8 +190,8 @@
     "cache_store_log /var/log/squid/store.log\n",
     "pid_filename /var/run/squid.pid\n",
     "hosts_file /etc/hosts\n",
-    "diskd_program /usr/lib/squid/diskd-daemon\n",
-    "unlinkd_program /usr/lib/squid/unlinkd\n",
+    "diskd_program ", LIBDIR, "/squid/diskd-daemon\n",
+    "unlinkd_program ", LIBDIR, "/squid/unlinkd\n",
     "emulate_httpd_log off\n",
     "log_ip_on_direct on\n",
     "log_mime_hdrs off\n",
@@ -264,7 +264,7 @@
     "icon_directory /usr/share/squid/icons\n",
     "global_internal_static on\n",
     "short_icon_urls off\n",
-    "error_directory /usr/share/squid/errors/English\n",
+    "error_directory /usr/share/squid/errors/en\n",
     "maximum_single_addr_tries 1\n",
     "retry_on_error off\n",
     "snmp_port 0\n",
@@ -315,7 +315,7 @@
     "relaxed_header_parser on\n",
     "\n\n",
     "acl our_networks src 192.168.0.0/24 192.168.1.0/24\n",
-    "acl localhost src 127.0.0.1/255.255.255.255\n",
+    "acl localhost src 127.0.0.1/32\n",
     "acl to_localhost dst 127.0.0.0/8\n",
     "acl manager proto cache_object\n",
     "acl QUERY urlpath_regex cgi-bin \\?\n",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gadmin-squid/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Aug 2008 01:56:24 -0000	1.2
+++ .cvsignore	22 Nov 2009 22:07:13 -0000	1.3
@@ -1 +1 @@
-gadmin-squid-0.1.0.tar.gz
+gadmin-squid-0.1.2.tar.gz


Index: gadmin-squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gadmin-squid/F-12/gadmin-squid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gadmin-squid.spec	24 Jul 2009 23:25:14 -0000	1.3
+++ gadmin-squid.spec	22 Nov 2009 22:07:14 -0000	1.4
@@ -1,40 +1,53 @@
-Summary:    GADMIN-SQUID -- A GTK+ administation tool for the Squid proxy server
+Summary:    A GTK+ administation tool for the Squid proxy server
 Name:       gadmin-squid
-Version:    0.1.0
-Release:    0.6%{?dist}
+Version:    0.1.2
+Release:    0.1%{?dist}
 License:    GPLv3+
 Group:      Applications/System
-URL:        http://sebuka.org/gadmintools/index.php?option=com_content&task=view&id=47&Itemid=37
+URL:        http://mange.dynalias.org/linux.html
 Source0:    http://mange.dynalias.org/linux/%{name}/%{name}-%{version}.tar.gz
-Patch1:     gadmin-squid-0.1.0-desktop.patch
-Patch2:     gadmin-squid-0.1.0-POTFILES.patch
-Patch3:     gadmin-squid-0.1.0-desktop-icon.patch
+# Mailed these to upstream 20091122
+Patch1:     %{name}-%{version}-Makefile.am.patch
+Patch2:     %{name}-%{version}-desktop-icon.patch
+Patch3:     %{name}-%{version}-po-Makefile.in.in.patch
+Patch4:     %{name}-%{version}-configure.in.patch
+Patch5:     %{name}-%{version}-src-standard.c.patch
+Patch6:     %{name}-%{version}-src-create_server_tab.c.patch
+Patch7:     %{name}-%{version}-src-create_acl_tab.c.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   usermode >= 1.36
 Requires:   squid >= 2.6
+Requires:   samba, samba-winbind
+Requires:   pam
+Requires:   openssl
 
-# Only need to explicitly include these for EPEL
-%if 0%{?rhel}
 BuildRequires: autoconf
 BuildRequires: automake
-%endif
+BuildRequires: glib-devel
 BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext-devel
+BuildRequires: samba-winbind-devel
+BuildRequires: pam-devel
+BuildRequires: openssl-devel
 
 %description
-GADMIN-SQUID is a fast and easy to use GTK+ administration tool 
-for the Squid proxy server
+A fast and easy to use GTK+ administration tool for the Squid proxy server.
+Most options found in squid and advanced ACL-building.
+Delay pools and logformats are discarded for now but are planned.
+Some options may not be compiled into your squid so you'll have to delete those
+in the configuration tab if you get any errors.
 
 %prep
 %setup -q
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-# Need to do this, because of old aclocal.m4 and Makefile.in inside the upstream tarball
-%{__aclocal}
-%{__automake} --add-missing --gnu ${am_opt};
-%configure
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%GNUconfigure "--docdir=%{_docdir}/%{name}-%{version}" "--disable-option-checking" "--enable-poll" "--enable-snmp" "--enable-removal-policies=heap,lru" "--enable-storeio=aufs,coss,diskd,null,ufs" "--enable-ssl" "--with-openssl=/usr/kerberos" "--enable-delay-pools" "--enable-useragent-log" "--enable-referer-log" "--disable-dependency-tracking" "--enable-cachemgr-hostname=localhost" "--enable-underscores" "--enable-cache-digests" "--enable-ident-lookups" "--with-large-files" "--enable-fd-config" "--enable-follow-x-forwarded-for" "--enable-linux-netfilter" "--with-pthreads" "--enable-auth=basic,digest,ntlm" "--enable-external-acl-helpers=ip_user,ldap_group,unix_group,wbinfo_group,winbind_group" "--enable-digest-auth-helpers=password" "--with-winbind-auth-challenge" "--enable-ntlm-auth-helpers=SMB,winbind,fakeauth" "--enable-basic-auth-helpers=LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,winbind"
 
 %build
 %{__make} %{?_smp_mflags}
@@ -67,6 +80,10 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+#%doc %{_docdir}/%{name}/README
+#%doc %{_docdir}/%{name}/COPYING
+#%doc %{_docdir}/%{name}/AUTHORS
+#%doc %{_docdir}/%{name}/ChangeLog
 %doc README
 %doc COPYING
 %doc AUTHORS
@@ -83,6 +100,18 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Sun Nov 22 2009 S.A. Hartsuiker <s.hartsuiker at ogd.nl> - 0.1.2-0.1
+- Upgraded to new upstream version, also in response to bz #498156
+- Updated package source URL (spec file change only)
+- Readded %%GNUconfigure, now works as it should (spec file change only)
+- Makes automatic squid.conf backups for each new version.
+- Now using "squid -k kill" to deactivate the server.
+- All options are ok for Fedora 11, Debian and Ubuntu.
+- Removes ACL name 'all' as an ACL definition type.
+- Added unit descriptions to some options that now require them.
+- Removes unhandled extra options.
+- Removes more options that Debian/Ubuntu's Squid is not compiled with: incoming_icp_average, incoming_http_average, incoming_dns_average min_icp_poll_cnt, min_dns_poll_cnt, min_http_poll_cnt. 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-0.6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -92,8 +121,8 @@ rm -rf %{buildroot}
 * Tue Aug 5 2008 S.A. Hartsuiker <s.hartsuiker at ogd.nl> - 0.1.0-0.4
 - Made autoconf and automake buildrequires conditional and remove
   %%GNUconfigure from the .spec
-- Added aclocal and automake to %%prep stage in the .spec, because of outdated files inside
-  the upstream tarball
+- Added aclocal and automake to %%prep stage in the .spec, because of outdated
+  files inside the upstream tarball
 - replaced another 'bare' make statement with %%{__make} in the %%install
   stage in the .spec
 
@@ -111,4 +140,4 @@ rm -rf %{buildroot}
 - Switched to GPL version 3.
 
 * Mon Jun 25 2007 Magnus-swe <magnus-swe at telia.com>
-- Initial release
+- Initial release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gadmin-squid/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Aug 2008 01:56:24 -0000	1.2
+++ sources	22 Nov 2009 22:07:14 -0000	1.3
@@ -1 +1 @@
-cdb23e367fc0d2f18c3717aabdc9ef21  gadmin-squid-0.1.0.tar.gz
+6bd94abaa362ce466d7802a11283c719  gadmin-squid-0.1.2.tar.gz


--- gadmin-squid-0.1.0-POTFILES.patch DELETED ---


--- gadmin-squid-0.1.0-desktop-icon.patch DELETED ---


--- gadmin-squid-0.1.0-desktop.patch DELETED ---


