openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
July 2013
- 1 participants
- 2024 discussions
Hello community,
here is the log from the commit of package libgssglue for openSUSE:Factory checked in at 2013-07-30 18:37:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libgssglue (Old)
and /work/SRC/openSUSE:Factory/.libgssglue.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgssglue"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libgssglue/libgssglue.changes 2013-04-17 07:14:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libgssglue.new/libgssglue.changes 2013-07-30 18:37:38.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Jul 29 08:24:54 UTC 2013 - meissner(a)suse.com
+
+- Updated to 0.4 release
+ Use secure_getenv instead of getenv for setuid
+ programs (bnc#694598 CVE-2011-2709 bnc#831805)
+
+- secure-getenv.patch: updated patch to use the now available
+ secure_getenv() instead.
+
+-------------------------------------------------------------------
Old:
----
libgssglue-0.3.tar.gz
New:
----
libgssglue-0.4.tar.gz
secure-getenv.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgssglue.spec ++++++
--- /var/tmp/diff_new_pack.nN8xi6/_old 2013-07-30 18:37:39.000000000 +0200
+++ /var/tmp/diff_new_pack.nN8xi6/_new 2013-07-30 18:37:39.000000000 +0200
@@ -21,7 +21,7 @@
Summary: Generic GSSAPI Library
License: BSD-3-Clause and MIT
Group: Development/Libraries/C and C++
-Version: 0.3
+Version: 0.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
@@ -31,6 +31,7 @@
Source: http://www.citi.umich.edu/projects/nfsv4/linux/%{name}/%{name}-%{version}.t…
Source1: baselibs.conf
Patch0: config-guess-sub-update.patch
+Patch1: secure-getenv.patch
%description
This library exports a gssapi interface, but does not implement any
@@ -63,6 +64,7 @@
%prep
%setup -q
%patch0
+%patch1 -p1
%build
autoconf
++++++ libgssglue-0.3.tar.gz -> libgssglue-0.4.tar.gz ++++++
++++ 16177 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgssglue-0.3/ChangeLog new/libgssglue-0.4/ChangeLog
--- old/libgssglue-0.3/ChangeLog 2011-06-22 17:12:01.000000000 +0200
+++ new/libgssglue-0.4/ChangeLog 2012-05-08 19:52:05.000000000 +0200
@@ -1,3 +1,10 @@
+2012-05-08: kwc
+ Release 0.4
+ Changes since libgssglue-0.3:
+ - Fix for CVE-2011-2709
+ Patch from Marcus Meissner
+ Note: Although https://bugzilla.novell.com/show_bug.cgi?id=694598
+ mentions mount.nfs, libgssglue is not used by mount.nfs.
2011-06-22: kwc
Release 0.3
Changes since libgssglue-0.2:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgssglue-0.3/configure.in new/libgssglue-0.4/configure.in
--- old/libgssglue-0.3/configure.in 2011-06-22 17:08:07.000000000 +0200
+++ new/libgssglue-0.4/configure.in 2012-05-08 19:42:18.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(libgssglue, 0.3, nfsv4-wg(a)citi.umich.edu)
+AC_INIT(libgssglue, 0.4, nfsv4-wg(a)citi.umich.edu)
AC_CONFIG_SRCDIR([src/g_accept_sec_context.c])
AM_INIT_AUTOMAKE
AM_PROG_LIBTOOL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgssglue-0.3/src/g_initialize.c new/libgssglue-0.4/src/g_initialize.c
--- old/libgssglue-0.3/src/g_initialize.c 2009-08-12 16:52:36.000000000 +0200
+++ new/libgssglue-0.4/src/g_initialize.c 2012-05-08 19:40:21.000000000 +0200
@@ -195,7 +195,8 @@
void *dl;
gss_mechanism (*sym)(void), mech;
- if ((filename = getenv("GSSAPI_MECH_CONF")) == NULL)
+ if ((getuid() != geteuid()) ||
+ ((filename = getenv("GSSAPI_MECH_CONF")) == NULL))
filename = MECH_CONF;
if ((conffile = fopen(filename, "r")) == NULL) {
@@ -271,7 +272,8 @@
void *dl;
gss_mechanism (*sym)(void), mech;
- if ((filename = getenv("GSSAPI_MECH_CONF")) == NULL)
+ if ((getuid() != geteuid()) ||
+ ((filename = getenv("GSSAPI_MECH_CONF")) == NULL))
filename = MECH_CONF;
if ((conffile = fopen(filename, "r")) == NULL) {
++++++ secure-getenv.patch ++++++
Index: libgssglue-0.4/src/g_initialize.c
===================================================================
--- libgssglue-0.4.orig/src/g_initialize.c
+++ libgssglue-0.4/src/g_initialize.c
@@ -26,6 +26,7 @@
* This function will initialize the gssapi mechglue library
*/
+#define _GNU_SOURCE
#include "mglueP.h"
#include <stdlib.h>
@@ -195,8 +196,7 @@ static void solaris_initialize ()
void *dl;
gss_mechanism (*sym)(void), mech;
- if ((getuid() != geteuid()) ||
- ((filename = getenv("GSSAPI_MECH_CONF")) == NULL))
+ if ((filename = secure_getenv("GSSAPI_MECH_CONF")) == NULL)
filename = MECH_CONF;
if ((conffile = fopen(filename, "r")) == NULL) {
@@ -272,8 +272,7 @@ static void linux_initialize ()
void *dl;
gss_mechanism (*sym)(void), mech;
- if ((getuid() != geteuid()) ||
- ((filename = getenv("GSSAPI_MECH_CONF")) == NULL))
+ if ((filename = secure_getenv("GSSAPI_MECH_CONF")) == NULL)
filename = MECH_CONF;
if ((conffile = fopen(filename, "r")) == NULL) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package icu for openSUSE:Factory checked in at 2013-07-30 18:37:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icu (Old)
and /work/SRC/openSUSE:Factory/.icu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu"
Changes:
--------
--- /work/SRC/openSUSE:Factory/icu/icu.changes 2013-07-29 17:41:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.icu.new/icu.changes 2013-07-30 18:37:29.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jul 29 18:34:20 UTC 2013 - dvaleev(a)suse.com
+
+- make filelist depend on architecture
+ icudt51b.dat - on BigEndian platforms
+ icudt51l.dat - on LittleEndian
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icu.spec ++++++
--- /var/tmp/diff_new_pack.ABDVwN/_old 2013-07-30 18:37:30.000000000 +0200
+++ /var/tmp/diff_new_pack.ABDVwN/_new 2013-07-30 18:37:30.000000000 +0200
@@ -22,7 +22,7 @@
Release: 0
%define aversion 51_2
Summary: International Components for Unicode
-License: X11
+License: MIT
Group: Development/Libraries/C and C++
Url: http://icu-project.org/
@@ -235,7 +235,11 @@
%defattr(-,root,root)
%dir %_datadir/icu
%dir %_datadir/icu/%version
+%ifarch %sparc mips hppa ppc ppc64 s390x
+%_datadir/icu/%version/icudt51b.dat
+%else
%_datadir/icu/%version/icudt51l.dat
+%endif
%files -n libicu-devel
%defattr(-, root, root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2013-07-30 18:37:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2 (Old)
and /work/SRC/openSUSE:Factory/.apache2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2013-07-02 12:20:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2013-07-30 18:37:16.000000000 +0200
@@ -1,0 +2,39 @@
+Mon Jul 29 19:53:48 UTC 2013 - crrodriguez(a)opensuse.org
+
+- provide and obsolete mod_macro
+- upgrade: some people complain that log_config module
+ is not enabled by default sometimes, fix that.
+- upgrade : "SSLMutex" no longer exists.
+- Toogle EnableSendfile on because now apache defaults to off
+ due to kernel bugs. that's a silly thing to do here
+ as kernel bugs have to be fixed at their source, not worked around
+ in applications.
+
+-------------------------------------------------------------------
+Mon Jul 22 21:57:40 UTC 2013 - crrodriguez(a)opensuse.org
+
+- httpd-event-ssl.patch: from upstream
+ Lift the restriction that prevents mod_ssl taking
+ full advantage of the event MPM.
+
+-------------------------------------------------------------------
+Mon Jul 22 16:44:22 UTC 2013 - crrodriguez(a)opensuse.org
+
+- Update to version 2.4.6
+* SECURITY: CVE-2013-1896 (cve.mitre.org)
+* SECURITY: CVE-2013-2249 (cve.mitre.org)
+* Major updates to mod_lua
+* Support for proxying websocket requests
+* Higher performant shm-based cache implementation
+* Addition of mod_macro for easier configuration management
+* As well as several exciting fixes, especially those related to RFC edge
+ cases in mod_cache and mod_proxy.
+
+- IMPORTANT : With the current packaging scheme, we can no longer
+Include the ITK MPM, therefore it has been disabled. This is because
+this MPM can now only be provided as a loadable module but we do
+not currently build MPMs as shared modules but as independant
+binaries and all helpers/startup scripts depend on that behaviour.
+It will be fixed in the upcoming weeks/months.
+
+-------------------------------------------------------------------
Old:
----
apache2.4-mpm-itk-2.4.2-01.patch
httpd-2.2.19-linux3.patch
httpd-2.4.4.tar.bz2
New:
----
httpd-2.4.6.tar.bz2
httpd-event-ssl.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -54,7 +54,7 @@
%{!?prefork:%define prefork 1}
%{!?worker:%define worker 1}
%{!?event:%define event 1}
-%{!?itk:%define itk 1}
+%{!?itk:%define itk 0}
%define mpms_to_build %(test %prefork = 1 && printf prefork) %(test %worker = 1 && printf worker) %(test %event = 1 && printf event) %(test %itk = 1 && printf itk)
# dir names
%define datadir /srv/www
@@ -81,8 +81,8 @@
# "Server:" header
%define VENDOR SUSE
%define platform_string Linux/%VENDOR
-%define realver 2.4.4
-Version: 2.4.4
+%define realver 2.4.6
+Version: 2.4.6
Release: 0
#Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2
Source0: httpd-%{realver}.tar.bz2
@@ -146,13 +146,12 @@
Patch68: httpd-2.x.x-logresolve.patch
Patch69: httpd-2.2.x-bnc690734.patch
Patch70: apache2-implicit-pointer-decl.patch
-Patch100: apache2.4-mpm-itk-2.4.2-01.patch
-Patch101: httpd-2.2.19-linux3.patch
# PATCH-FEATURE-UPSTREAM apache2-mod_ssl_npn.patch dimstar(a)opensuse.org -- Add npn support to mod_ssl (needed for spdy)
#Patch108: apache2-mod_ssl_npn.patch
#Provides: apache2(mod_ssl+npn)
# PATCH-FEATURE-UPSTREAM httpd-2.4.3-mod_systemd.patch crrodriguez(a)opensuse.org simple module provides systemd integration.
Patch109: httpd-2.4.3-mod_systemd.patch
+Patch110: http://people.apache.org/~minfrin/httpd-event-ssl.patch
Url: http://httpd.apache.org/
Icon: Apache.xpm
Summary: The Apache Web Server Version 2.2
@@ -162,6 +161,8 @@
Provides: http_daemon
Provides: httpd
Provides: suse_help_viewer
+Provides: %{name}-mod_macro = %{version}
+Obsoletes: %{name}-mod_macro <= 1.2.1
Requires: %{pname}-MPM
Requires: /etc/mime.types
PreReq: %{name}-utils
@@ -365,18 +366,16 @@
#
%setup -q -n httpd-%{realver}
%patch2 -p1
-%patch23
+%patch23 -p1
#%patch65 -p1
-%patch66
+%patch66 -p1
%patch67 -p1
%patch68 -p1
#%patch69
%patch70 -p1
-%patch100 -p1
-%patch101
#%patch108 -p1
%patch109 -p1
-#
+%patch110
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
# install READMEs
++++++ apache-20-22-upgrade ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -75,4 +75,8 @@
a2enmod authn_core
fi
+if ! a2enmod -q log_config; then
+ a2enmod log_config
+fi
+
echo 'Done.'
++++++ apache2-implicit-pointer-decl.patch ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -1,5 +1,5 @@
---- httpd-2.4.4.orig/server/request.c
-+++ httpd-2.4.4/server/request.c
+--- httpd-2.4.6.orig/server/request.c
++++ httpd-2.4.6/server/request.c
@@ -46,10 +46,13 @@
#include "util_script.h"
#include "ap_expr.h"
@@ -15,8 +15,8 @@
#if APR_HAVE_STDARG_H
#include <stdarg.h>
#endif
---- httpd-2.4.4.orig/server/config.c
-+++ httpd-2.4.4/server/config.c
+--- httpd-2.4.6.orig/server/config.c
++++ httpd-2.4.6/server/config.c
@@ -48,10 +48,14 @@
#include "http_request.h" /* for default_handler (see invoke_handler) */
#include "http_main.h"
++++++ apache2-server-tuning.conf ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -114,7 +114,7 @@
# filesystems. Please see
# http://httpd.apache.org/docs-2.2/mod/core.html#enablesendfile
#
-#EnableSendfile off
+EnableSendfile on
<IfModule mod_setenvif.c>
#
++++++ apache2-ssl-global.conf ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -48,10 +48,6 @@
SSLSessionCache shmcb:/var/lib/apache2/ssl_scache(512000)
SSLSessionCacheTimeout 300
- # Semaphore:
- # Configure the path to the mutual exclusion semaphore the
- # SSL engine uses internally for inter-process synchronization.
- SSLMutex "file:/var/lib/apache2/ssl_mutex"
# Pseudo Random Number Generator (PRNG):
# Configure one or more sources to seed the PRNG of the
++++++ httpd-2.0.54-envvars.dif ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -1,5 +1,5 @@
---- support/envvars-std.in.orig
-+++ support/envvars-std.in
+--- httpd-2.4.6.orig/support/envvars-std.in
++++ httpd-2.4.6/support/envvars-std.in
@@ -18,11 +18,9 @@
#
# This file is generated from envvars-std.in
++++++ httpd-2.1.3alpha-layout.dif ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -1,6 +1,6 @@
---- httpd-2.1.3-alpha.orig/config.layout
-+++ httpd-2.1.3-alpha/config.layout
-@@ -202,6 +202,54 @@
+--- httpd-2.4.6.orig/config.layout
++++ httpd-2.4.6/config.layout
+@@ -178,6 +178,54 @@
proxycachedir: /var/cache/httpd
</Layout>
++++++ httpd-2.1.9-apachectl.dif ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -1,5 +1,5 @@
---- support/apachectl.in.orig
-+++ support/apachectl.in
+--- httpd-2.4.6.orig/support/apachectl.in
++++ httpd-2.4.6/support/apachectl.in
@@ -42,17 +42,32 @@ ARGV="$@"
# -------------------- --------------------
#
++++++ httpd-2.2.0-apxs-a2enmod.dif ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:18.000000000 +0200
@@ -1,8 +1,6 @@
-Index: httpd-2.2.16/support/apxs.in
-===================================================================
---- httpd-2.2.16.orig/support/apxs.in
-+++ httpd-2.2.16/support/apxs.in
-@@ -526,108 +526,14 @@ if ($opt_i or $opt_e) {
+--- httpd-2.4.6.orig/support/apxs.in
++++ httpd-2.4.6/support/apxs.in
+@@ -550,108 +550,14 @@ if ($opt_i or $opt_e) {
# activate module via LoadModule/AddModule directive
if ($opt_a or $opt_A) {
++++++ httpd-2.4.4.tar.bz2 -> httpd-2.4.6.tar.bz2 ++++++
++++ 51743 lines of diff (skipped)
++++++ httpd-2.x.x-logresolve.patch ++++++
--- /var/tmp/diff_new_pack.53kTBm/_old 2013-07-30 18:37:21.000000000 +0200
+++ /var/tmp/diff_new_pack.53kTBm/_new 2013-07-30 18:37:21.000000000 +0200
@@ -1,7 +1,6 @@
-diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl.in
---- ../httpd-2.2.4.orig/support/logresolve.pl.in 2006-07-12 05:38:44.000000000 +0200
-+++ ./support/logresolve.pl.in 2007-10-23 13:59:27.000000000 +0200
-@@ -57,6 +57,7 @@
+--- httpd-2.4.6.orig/support/logresolve.pl.in
++++ httpd-2.4.6/support/logresolve.pl.in
+@@ -57,6 +57,7 @@ $|=1;
use FileHandle;
use Socket;
@@ -9,7 +8,7 @@
use strict;
no strict 'refs';
-@@ -71,11 +72,13 @@
+@@ -71,11 +72,13 @@ my $filename;
my %hash = ();
my $parent = $$;
@@ -24,7 +23,7 @@
if (-e $filename) { unlink($filename) || warn "$filename .. $!\n";}
&child($child);
exit(0);
-@@ -91,9 +94,9 @@
+@@ -91,9 +94,9 @@ sub cleanup {
# die kiddies, die
kill(15, @children);
for (my $child = 1; $child <=$CHILDREN; $child++) {
@@ -37,7 +36,7 @@
}
}
}
-@@ -113,7 +116,7 @@
+@@ -113,7 +116,7 @@ sub parent {
if (!socket($CHILDSOCK{$child}, AF_UNIX, SOCK_STREAM, $PROTOCOL)) {
warn "parent socket to child failed $!";
}
@@ -46,7 +45,7 @@
my $response;
do {
$response = connect($CHILDSOCK{$child}, sockaddr_un($filename));
-@@ -176,7 +179,7 @@
+@@ -176,7 +179,7 @@ sub child {
# create a socket to communicate with parent
socket(INBOUND, AF_UNIX, SOCK_STREAM, $PROTOCOL)
|| die "Error with Socket: !$\n";
++++++ httpd-event-ssl.patch ++++++
--- include/httpd.h.orig
+++ include/httpd.h
@@ -1175,12 +1175,20 @@ typedef enum {
CONN_STATE_LINGER_SHORT /* MPM has started lingering close with short timeout */
} conn_state_e;
+typedef enum {
+ CONN_SENSE_DEFAULT,
+ CONN_SENSE_WANT_READ, /* next event must be read */
+ CONN_SENSE_WANT_WRITE /* next event must be write */
+} conn_sense_e;
+
/**
* @brief A structure to contain connection state information
*/
struct conn_state_t {
/** Current state of the connection */
conn_state_e state;
+ /** Whether to read instead of write, or write instead of read */
+ conn_sense_e sense;
};
/* Per-vhost config... */
--- modules/ssl/ssl_engine_io.c.orig
+++ modules/ssl/ssl_engine_io.c
@@ -775,6 +775,18 @@ static apr_status_t ssl_filter_write(ap_
*/
outctx->rc = APR_EAGAIN;
}
+ else if (ssl_err == SSL_ERROR_WANT_READ) {
+ /*
+ * If OpenSSL wants to read during write, and we were
+ * nonblocking, set the sense explicitly to read and
+ * report as an EAGAIN.
+ *
+ * (This is usually the case when the client forces an SSL
+ * renegotiation which is handled implicitly by OpenSSL.)
+ */
+ outctx->c->cs->sense = CONN_SENSE_WANT_READ;
+ outctx->rc = APR_EAGAIN;
+ }
else if (ssl_err == SSL_ERROR_SYSCALL) {
ap_log_cerror(APLOG_MARK, APLOG_INFO, outctx->rc, c, APLOGNO(01993)
"SSL output filter write failed.");
@@ -1902,8 +1914,10 @@ void ssl_io_filter_init(conn_rec *c, req
filter_ctx->pbioWrite = BIO_new(&bio_filter_out_method);
filter_ctx->pbioWrite->ptr = (void *)bio_filter_out_ctx_new(filter_ctx, c);
- /* We insert a clogging input filter. Let the core know. */
- c->clogging_input_filters = 1;
+ /* write is non blocking for the benefit of async mpm */
+ if (c->cs) {
+ BIO_set_nbio(filter_ctx->pbioWrite, 1);
+ }
ssl_io_input_add_filter(filter_ctx, c, r, ssl);
--- server/mpm/event/event.c.orig
+++ server/mpm/event/event.c
@@ -790,7 +790,10 @@ static int start_lingering_close_common(
apr_atomic_inc32(&lingering_count);
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(*q, cs);
- cs->pfd.reqevents = APR_POLLIN | APR_POLLHUP | APR_POLLERR;
+ cs->pfd.reqevents = (
+ cs->pub.sense == CONN_SENSE_WANT_WRITE ? APR_POLLOUT :
+ APR_POLLIN) | APR_POLLHUP | APR_POLLERR;
+ cs->pub.sense = CONN_SENSE_DEFAULT;
rv = apr_pollset_add(event_pollset, &cs->pfd);
apr_thread_mutex_unlock(timeout_mutex);
if (rv != APR_SUCCESS && !APR_STATUS_IS_EEXIST(rv)) {
@@ -938,6 +941,7 @@ static void process_socket(apr_thread_t
*/
cs->pub.state = CONN_STATE_READ_REQUEST_LINE;
+ cs->pub.sense = CONN_SENSE_DEFAULT;
}
else {
c = cs->c;
@@ -946,9 +950,11 @@ static void process_socket(apr_thread_t
}
if (c->clogging_input_filters && !c->aborted) {
- /* Since we have an input filter which 'cloggs' the input stream,
- * like mod_ssl, lets just do the normal read from input filters,
- * like the Worker MPM does.
+ /* Since we have an input filter which 'clogs' the input stream,
+ * like mod_ssl used to, lets just do the normal read from input
+ * filters, like the Worker MPM does. Filters that need to write
+ * where they would otherwise read, or read where they would
+ * otherwise write, should set the sense appropriately.
*/
apr_atomic_inc32(&clogged_count);
ap_run_process_connection(c);
@@ -994,7 +1000,10 @@ read_request:
cs->expiration_time = ap_server_conf->timeout + apr_time_now();
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(write_completion_q, cs);
- cs->pfd.reqevents = APR_POLLOUT | APR_POLLHUP | APR_POLLERR;
+ cs->pfd.reqevents = (
+ cs->pub.sense == CONN_SENSE_WANT_READ ? APR_POLLIN :
+ APR_POLLOUT) | APR_POLLHUP | APR_POLLERR;
+ cs->pub.sense = CONN_SENSE_DEFAULT;
rc = apr_pollset_add(event_pollset, &cs->pfd);
apr_thread_mutex_unlock(timeout_mutex);
return;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xmahjongg for openSUSE:Factory checked in at 2013-07-30 16:48:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmahjongg (Old)
and /work/SRC/openSUSE:Factory/.xmahjongg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmahjongg"
Changes:
--------
New Changes file:
--- /dev/null 2013-07-23 23:44:04.804033756 +0200
+++ /work/SRC/openSUSE:Factory/.xmahjongg.new/xmahjongg.changes 2013-07-30 16:48:39.000000000 +0200
@@ -0,0 +1,16 @@
+-------------------------------------------------------------------
+Sun Jul 28 09:46:20 UTC 2013 - dap.darkness(a)gmail.com
+
+- GPL-2.0+ was set to the License tag in accoarding to bnc#829193 #10.
+
+-------------------------------------------------------------------
+Fri Jul 5 20:03:03 UTC 2013 - dap.darkness(a)gmail.com
+
+- Conflicts with xmahjong package because xmahjong is really
+ xmahjongg ver. 2.
+
+-------------------------------------------------------------------
+Thu Jun 27 20:13:06 UTC 2013 - dap.darkness(a)gmail.com
+
+- Initial build.
+
New:
----
xmahjongg-3.7.tar.gz
xmahjongg.changes
xmahjongg.desktop
xmahjongg.png
xmahjongg.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmahjongg.spec ++++++
#
# spec file for package xmahjongg
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: xmahjongg
Version: 3.7
Release: 0
Summary: Colorful X solitaire MahJongg game
License: GPL-2.0+
Group: Amusements/Games/Board/Card
Url: http://www.lcdf.org/xmahjongg/
Source0: http://www.lcdf.org/xmahjongg/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Source2: %{name}.png
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(x11)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Conflicts: xmahjong
%description
Real Mah Jongg is a social game that originated in China thousands of
years ago. Four players, named after the four winds, take tiles from a
wall in turn. The best tiles are made of ivory and wood; they click
pleasantly when you knock them together. Computer Solitaire Mah Jongg
(xmahjongg being one of the sillier examples) is nothing like that but
it's fun, or it must be, since there are like 300 shareware versions
available for Windows. This is for X11 and it's free.
%prep
%setup -q
%build
%configure
make %{?_smp_mflags}
%install
%make_install
%{__install} -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%suse_update_desktop_file -i %{name}
%files
%defattr(-,root,root)
%doc NEWS README
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.*
%{_datadir}/applications/%{name}.*
%{_mandir}/man6/%{name}.6*
%{_datadir}/%{name}
%changelog
++++++ xmahjongg.desktop ++++++
[Desktop Entry]
Name=Xmahjongg
GenericName=Mahjongg Solitaire
GenericName[ast]=Solitariu Mahjongg
GenericName[bs]=Mahjongg soliter
GenericName[ca]=Solitari Mahjongg
GenericName[ca@valencia]=Solitari Mahjongg
GenericName[cs]=Mahjongg solitér
GenericName[da]=Mahjongg Solitaire
GenericName[de]=Mahjongg Solitär
GenericName[el]=Mahjongg Solitaire
GenericName[en_GB]=Mahjongg Solitaire
GenericName[es]=Solitario Mahjongg
GenericName[et]=Mahjongg
GenericName[eu]=Mahjongg bakar-jokoa
GenericName[fa]=فال Mahjongg
GenericName[fi]=Mahjongg-pasianssi
GenericName[fr]=Mahjongg Solitaire
GenericName[ga]=Cluiche Aonair Mahjongg
GenericName[gl]=O solitario Mahjongg
GenericName[hne]=महजोंग सालिटेयर
GenericName[hu]=Mah Jongg
GenericName[it]=Solitario Mahjongg
GenericName[ja]=上海マージャン牌ゲーム
GenericName[kk]=Маджонг пасьянсы
GenericName[km]=Mahjongg Solitaire
GenericName[ko]=마작 게임
GenericName[lt]=Mahjongg pasjansas
GenericName[lv]=Mahjongg Solitaire
GenericName[nb]=Mahjongg-kabal
GenericName[nds]=Eenspeler-Mahjongg
GenericName[ne]=माहाजोङ्ग सोलिटेयर
GenericName[nl]=Mahjongg Solitaire
GenericName[nn]=Mahjongg-kabal
GenericName[pl]=Mahjongg
GenericName[pt]=Mahjongg Solitário
GenericName[pt_BR]=Paciência Mahjongg
GenericName[ro]=Pasențe Mahjongg
GenericName[ru]=Пасьянс Маджонг
GenericName[sk]=Mahjongg
GenericName[sl]=Pasjansa Mahjongg
GenericName[sq]=Mahjongg Solitaire
GenericName[sr]=Махђонг пасијанс
GenericName[sr@ijekavian]=Махђонг пасијанс
GenericName[sr@ijekavianlatin]=Mahđong pasijans
GenericName[sr@latin]=Mahđong pasijans
GenericName[sv]=Mahjongg-patiens
GenericName[tr]=Mahjongg Solitaire
GenericName[ug]=Mahjongg Solitaire
GenericName[uk]=Карткова гра Маджонґ
GenericName[wa]=Solitaire Magjongg
GenericName[x-test]=xxMahjongg Solitairexx
GenericName[zh_CN]=麻将纸牌
GenericName[zh_TW]=上海麻將遊戲
Comment=Colorful solitaire Mah Jongg game
Comment[pl]=Kolorowa układanka Mah Jongg
Comment[ru]=Пасьянс с фишками традиционной китайской игры Маджонг
Icon=xmahjongg.png
Exec=xmahjongg
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Game;BoardGame;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package squid for openSUSE:Factory checked in at 2013-07-30 16:48:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/squid (Old)
and /work/SRC/openSUSE:Factory/.squid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid"
Changes:
--------
--- /work/SRC/openSUSE:Factory/squid/squid.changes 2013-07-25 14:46:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2013-07-30 16:48:26.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Jul 28 12:44:37 UTC 2013 - bruno(a)ioda-net.ch
+
+- Changes for squid 3.2.13 release (July 13th 2013)
+ Better handling of strange port values in Host:
+ Bug #3869: assertion failed: MemBuf.cc:272: size < capacity
+
+- Changes for squid 3.2.12 release (July 10th 2013)
+ Protect against buffer overrun in DNS query generation
+ Revert rev.11818 - not applicable to 3.2.
+ Allocate ClientInfo::hash.key using malloc() instead of new char[]
+ Remove origin_tries limiter on forwarding
+ Fixed leaking configurable SSL error details.
+ Fix memory error with Kerberos authentication
+ Avoid !closing assertions when helpers call comm_read [during reconfigure].
+ Avoid Comm::Connection leaks when helpers are reconfigured or otherwise closed.
+ Add missing piece omitted from rev.9677
+
+-------------------------------------------------------------------
Old:
----
squid-3.2.11.tar.bz2
squid-3.2.11.tar.bz2.asc
New:
----
squid-3.2.13.tar.bz2
squid-3.2.13.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squid.spec ++++++
--- /var/tmp/diff_new_pack.Hv9GR3/_old 2013-07-30 16:48:27.000000000 +0200
+++ /var/tmp/diff_new_pack.Hv9GR3/_new 2013-07-30 16:48:27.000000000 +0200
@@ -18,12 +18,13 @@
%define squidlibdir %{_libdir}/squid
%define squidconfdir /etc/squid
+%define version_published "2013-07-24"
Name: squid
Summary: Squid Version 3.2 WWW Proxy Server
License: GPL-2.0+
Group: Productivity/Networking/Web/Proxy
-Version: 3.2.11
+Version: 3.2.13
Release: 0
Url: http://www.squid-cache.org/Versions/v3/3.2
Source0: http://www.squid-cache.org/Versions/v3/3.2/%{name}-%{version}.tar.bz2
@@ -135,8 +136,8 @@
* Cache Manager access changes
First STABLE release Date: 02 Aug 2010
- Latest Release: 3.2.9
- Latest Release Date: 12 Mar 2013
+ Latest Release: %{version}
+ Latest Release Date: %{version_published}
%prep
%gpg_verify %{S:1}
++++++ RELEASENOTES.html ++++++
--- /var/tmp/diff_new_pack.Hv9GR3/_old 2013-07-30 16:48:27.000000000 +0200
+++ /var/tmp/diff_new_pack.Hv9GR3/_new 2013-07-30 16:48:27.000000000 +0200
@@ -1,11 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<HTML>
<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.66">
- <TITLE>Squid 3.2.6 release notes</TITLE>
+ <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.69">
+ <TITLE>Squid 3.2.13 release notes</TITLE>
</HEAD>
<BODY>
-<H1>Squid 3.2.6 release notes</H1>
+<H1>Squid 3.2.13 release notes</H1>
<H2>Squid Developers</H2>
<HR>
@@ -72,12 +72,14 @@
<HR>
<H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2>
-<P>The Squid Team are pleased to announce the release of Squid-3.2.6 for
-testing.</P>
+<P>The Squid Team are pleased to announce the release of Squid-3.2.13.</P>
<P>This new release is available for download from
-<A HREF="http://www.squid-cache.org/Versions/v3/3.2/">http://www.squid-cache.org/Versions/v3/3.2/</A> or the
+<A HREF="http://www.squid-cache.org/Versions/v3/3.2/">http://www.squid-cache.org/Versions/v3/3.2/</A> or the
<A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P>
-<P>While this release is not deemed ready for production use, we believe it is ready for wider testing by the community.</P>
+
+<P>A large number of the show-stopper bugs have been fixed along with general improvements to the IPv6 support.
+While this release is not fully bug-free we believe it is ready for use in production on many systems.</P>
+
<P>We welcome feedback and bug reports. If you find a bug, please see
<A HREF="http://wiki.squid-cache.org/SquidFaq/BugReporting">http://wiki.squid-cache.org/SquidFaq/BugReporting</A> for how to submit a
report with a stack trace.</P>
@@ -86,7 +88,7 @@
</H2>
<P>Although this release is deemed good enough for use in many setups, please note the existence of
-<A HREF="http://bugs.squid-cache.org/buglist.cgi?query_format=advanced&short_des…">open bugs against Squid-3.2</A>.</P>
+<A HREF="http://bugs.squid-cache.org/buglist.cgi?query_format=advanced&product=S…">open bugs against Squid-3.2</A>.</P>
<P>Some issues to note as currently known in this release which are not able to be fixed in the 3.2 series are:</P>
<P>
@@ -160,7 +162,7 @@
DNS lookups to locate alternative DIRECT destinations will not be done.</P>
<P>Known Issue: When non-strict validation fails Squid will relay the request, but can only do
-so safely to the orginal destination IP the client was contacting. The client original
+so safely to the original destination IP the client was contacting. The client original
destination IP is lost when relaying to peers in a hierarchy. This means the upstream peers
are still at risk of causing same-origin bypass CVE-2009-0801 vulnerability.
Developer time is required to implement safe transit of these requests.
@@ -253,7 +255,7 @@
path and parameters as its own command parameters. The <EM>concurrency</EM> setting already
existing in Squid is used to configure how many child helpers it may run.</P>
-<P>For example, a traditional configration is
+<P>For example, a traditional configuration is
<PRE>
url_rewrite_program /your/redirector.sh
url_rewrite_children 5
@@ -289,10 +291,10 @@
<P>The on-demand helpers feature allows greater flexibility and resolves this problem by allowing
maximum, initial and idle thresholds to be configured. Squid will start the initial set during
start and reconfigure phases. However over the operational use new helpers up to the maxium will
-be started as load demands. The idle threshold determins how many more helpers to start if the
+be started as load demands. The idle threshold determines how many more helpers to start if the
currently running set is not enough to handle current request loads.</P>
-<P>For example, a traditional configration is
+<P>For example, a traditional configuration is
<PRE>
auth_param ntlm /usr/libexec/squid/ntlm_auth
auth_param ntlm children 200
@@ -357,7 +359,7 @@
<P>
<UL>
<LI>mswin_check_ad_group - ext_ad_group_acl - Check logged in users Group membership using Active Directory.</LI>
-<LI>ip_user_check - ext_file_userip_acl - Restrict users to cetain IP addresses, using a text file backend.</LI>
+<LI>ip_user_check - ext_file_userip_acl - Restrict users to certain IP addresses, using a text file backend.</LI>
<LI>squid_kerb_ldap - ext_kerberos_ldap_group_acl - Check logged in Kerberos or NTLM users Group membership using LDAP.</LI>
<LI>squid_ldap_group - ext_ldap_group_acl - Check logged in users Group membership using LDAP.</LI>
<LI>mswin_check_lm_group - ext_lm_group_acl - Check logged in users Group membership using LanManager.</LI>
@@ -416,8 +418,8 @@
<P>Automatic detection and use of the pthreads library available from Solaris 10</P>
-<P>The result of this addition means that faster more efficient AUFS cache storage mechanisims
-are now available in Solaris 10.</P>
+<P>The result of this addition means that faster more efficient AUFS cache storage mechanism
+is now available in Solaris 10.</P>
<P>Support is experimental at this stage due to lack of feedback on the results of enabling it.
We recommend giving AUFS a try for faster disk storage and encourage feedback.</P>
@@ -431,14 +433,14 @@
feature support in Squid. This release opens Surrogate support to all reverse proxies.</P>
<P>Reverse proxy requests sent on to the web server include the HTTP header <EM>Surrogate-Capabilities:</EM>
-specifying the capabilities of the reverse proxy along with an ID which can be used to target reponses with
+specifying the capabilities of the reverse proxy along with an ID which can be used to target responses with
a <EM>Surrogate-Control:</EM> HTTP header used instead of the <EM>Cache-Control:</EM> header.</P>
<P>The default surrogate ID is generated automatically from the Squid site-unique hostname as found by the
automatic detection or manual configuration of <EM>visible_hostname</EM> although can be configured
separately with the <EM>httpd_accel_surrogate_id</EM> option.</P>
-<P><EM>Security Considerations:</EM> Websites sould be careful of accepting any surrogate ID.
+<P><EM>Security Considerations:</EM> Websites should be careful of accepting any surrogate ID.
Older releases of Squid leak the Surrogate-Control headers to external servers.
This 3.2 series of Squid will now prevent this leakage of its own ID destined responses, however it is possible
and for some uses desirable to receive external reverse-proxies <EM>Surrogate-Capabilities:</EM> headers.</P>
@@ -553,7 +555,7 @@
<UL>
<LI>should contain a complete HTML page, with optional client-side scripting.</LI>
<LI>must not contain server-side scripting. </LI>
-<LI>will have macro substitution performed on it using the same macros as used by the error page tempates.</LI>
+<LI>will have macro substitution performed on it using the same macros as used by the error page templates.</LI>
</UL>
</P>
@@ -588,32 +590,32 @@
headers or eCAP options to Squid ICAP requests or eCAP transactions.</P>
<DT><B>adaptation_send_client_ip</B><DD>
-<P>Same as depricated icap_send_client_ip
+<P>Same as deprecated icap_send_client_ip
but applies to both ICAP and eCAP.</P>
<DT><B>adaptation_send_username</B><DD>
-<P>Same as depricated icap_send_client_username
+<P>Same as deprecated icap_send_client_username
but applies to both ICAP and eCAP.</P>
<DT><B>adaptation_uses_indirect_client</B><DD>
-<P>Same as depricated icap_uses_indirect_client
+<P>Same as deprecated icap_uses_indirect_client
but applies to both ICAP and eCAP.</P>
<DT><B>client_delay_pools</B><DD>
-<P>New setting for client bandwith limits to specifies the number
+<P>New setting for client bandwidth limits to specifies the number
of client delay pools used.</P>
<DT><B>client_delay_initial_bucket_level</B><DD>
-<P>New setting for client bandwith limits to determine the initial
+<P>New setting for client bandwidth limits to determine the initial
bucket size as a percentage of max_bucket_size from
client_delay_parameters.</P>
<DT><B>client_delay_parameters</B><DD>
-<P>New setting for client bandwith limits to configures client-side
+<P>New setting for client bandwidth limits to configures client-side
bandwidth limits.</P>
<DT><B>client_delay_access</B><DD>
-<P>New setting for client bandwith limits to determines the
+<P>New setting for client bandwidth limits to determines the
client-side delay pool for the request.</P>
<DT><B>client_dst_passthru</B><DD>
@@ -727,17 +729,12 @@
New installs, or installs with no logs configured explicitly will use this module by default.</P>
<P>New <EM>tcp</EM> module to send each log line as text data to a TCP receiver.</P>
<P>New <EM>udp</EM> module to send each log line as text data to a UDP receiver.</P>
-<P>New format <EM>referrer</EM> to log with the format prevously used by referer_log directive.</P>
-<P>New format <EM>useragent</EM> to log with the format prevously used by useragent_log directive.</P>
+<P>New format <EM>referrer</EM> to log with the format previously used by referer_log directive.</P>
+<P>New format <EM>useragent</EM> to log with the format previously used by useragent_log directive.</P>
-<DT><B>acl : random, localip, localport</B><DD>
+<DT><B>acl : random, urllogin</B><DD>
<P>New type <EM>random</EM>. Pseudo-randomly match requests based on a configured probability.</P>
-<P>Renamed <EM>myip</EM> to <EM>localip</EM>. It matches the IP which the client connected to.</P>
-<P>Renamed <EM>myport</EM> to <EM>localport</EM>. It matches the port which the client connected to.</P>
<P>Ported <EM>urllogin</EM> option from Squid 2.7, to match a regex pattern on the URL login field (if any).</P>
-<P>The <EM>localip</EM>/<EM>localport</EM> differ from earlier releases where they matched a mix of
-of an invalid IP and port 0, the client destination IP/port or the Squid listening IP/port.
-This definition is now consistent across all modes of traffic received by Squid.</P>
<P>The <EM>manager</EM> ACL requires adjustment to cover new cache manager access. So it has now been
built-in as a predefined ACL name matching URLs equivalent to the following regular expression:
<PRE>
@@ -749,7 +746,7 @@
<DT><B>auth_param</B><DD>
<P>New options for Basic, Digest, NTLM, Negotiate <EM>children</EM> settings.
-<EM>startup=N</EM> determins minimum number of helper processes used.
+<EM>startup=N</EM> determines minimum number of helper processes used.
<EM>idle=N</EM> determines how many helper to retain as buffer against sudden traffic loads.
<EM>concurrency=N</EM> previously called <EM>auth_param ... concurrency</EM> as a separate option.</P>
<P>Removed Basic, Digest, NTLM, Negotiate <EM>auth_param ... concurrency</EM> setting option.</P>
@@ -783,8 +780,8 @@
<P><EM>%SRCEUI64</EM> EUI-64 of clients with SLAAC address.</P>
<P><EM>%EXT_LOG</EM> log= message returned by previous external ACL calls. An updated version may be returned.</P>
<P><EM>%EXT_TAG</EM> tag= value returned by previous external ACL calls. Tag may not be altered once set.</P>
-<P><EM>children-max=N</EM> determins maximum number of helper processes used.</P>
-<P><EM>children-startup=N</EM> determins minimum number of helper processes used.</P>
+<P><EM>children-max=N</EM> determines maximum number of helper processes used.</P>
+<P><EM>children-startup=N</EM> determines minimum number of helper processes used.</P>
<P><EM>children-idle=N</EM> determines how many helper to retain as buffer against sudden traffic loads.</P>
<P>Deprecated <EM>children=N</EM> in favor of <EM>children-max=N</EM>.</P>
@@ -1024,16 +1021,16 @@
<P>Replaced by --enable-eui</P>
<DT><B>--enable-auth-basic-helpers</B><DD>
-<P>replaced by <EM>--enable-auth-basic</EM>.</P>
+<P>Replaced by <EM>--enable-auth-basic</EM>.</P>
<DT><B>--enable-auth-digest-helpers</B><DD>
-<P>replaced by <EM>--enable-auth-digest</EM>.</P>
+<P>Replaced by <EM>--enable-auth-digest</EM>.</P>
<DT><B>--enable-auth-negotiate-helpers</B><DD>
-<P>replaced by <EM>--enable-auth-negotiate</EM>.</P>
+<P>Replaced by <EM>--enable-auth-negotiate</EM>.</P>
<DT><B>--enable-auth-ntlm-helpers</B><DD>
-<P>replaced by <EM>--enable-auth-ntlm</EM>.</P>
+<P>Replaced by <EM>--enable-auth-ntlm</EM>.</P>
<DT><B>--enable-referer-log</B><DD>
<P>Obsolete.</P>
@@ -1066,7 +1063,7 @@
An external_acl_type helper may be used to bypass authentication if that is suitable.</P>
<DT><B>cache_peer</B><DD>
-<P><EM>http11</EM> Obsolete.</P>
+<P>Option <EM>http11</EM> obsolete.</P>
<DT><B>external_acl_type</B><DD>
<P>Format tag <EM>%{Header}</EM> replaced by <EM>%>{Header}</EM></P>
@@ -1076,9 +1073,9 @@
<P>Replaced by <EM>request_header_access</EM> and <EM>reply_header_access</EM></P>
<DT><B>http_port</B><DD>
-<P><EM>no-connection-auth</EM> replaced by <EM>connection-auth=[on|off]</EM>. Default is ON.</P>
-<P><EM>transparent</EM> option replaced by <EM>intercept</EM></P>
-<P><EM>http11</EM> obsolete.</P>
+<P>Option <EM>no-connection-auth</EM> replaced by <EM>connection-auth=[on|off]</EM>. Default is ON.</P>
+<P>Option <EM>transparent</EM> option replaced by <EM>intercept</EM></P>
+<P>Option <EM>http11</EM> obsolete.</P>
<DT><B>http_access2</B><DD>
<P>Replaced by <EM>adapted_http_access</EM></P>
@@ -1095,6 +1092,12 @@
<DT><B>server_http11</B><DD>
<P>Obsolete.</P>
+<DT><B>update_headers</B><DD>
+<P>Obsolete. The experimental actions enabled in 2.7 by this option have been integrated as default
+actions for the <EM>rock</EM> storage type and memory caches.
+The configuration option is no longer necessary and has been dropped.
+NOTE: It is not yet supported by <EM>ufs</EM>, <EM>aufs</EM>, or <EM>diskd</EM> storage.</P>
+
<DT><B>upgrade_http0.9</B><DD>
<P>Obsolete.</P>
@@ -1275,9 +1278,6 @@
<DT><B>storeurl_rewrite_program</B><DD>
<P>Not yet ported from 2.7</P>
-<DT><B>update_headers</B><DD>
-<P>Not yet fully ported from 2.7. Memory and rock storage caches support this natively. UFS caches do not support it.</P>
-
</DL>
</P>
</BODY>
++++++ squid-3.2.11.tar.bz2 -> squid-3.2.13.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/ChangeLog new/squid-3.2.13/ChangeLog
--- old/squid-3.2.11/ChangeLog 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/ChangeLog 2013-07-13 15:22:32.000000000 +0200
@@ -1,4 +1,16 @@
+Changes to squid-3.2.13 (13 Jul 2013):
+
+ - Bug 3869: assertion failed: MemBuf.cc:272: size < capacity
+ - Improved handling of port values in Host: header validation
+
+Changes to squid-3.2.12 (11 Jul 2013):
+
+ - Protect against buffer overrun in DNS query generation
+ - Avoid !closing assertions when helpers call comm_read during reconfigure.
+ - Fix several minor memory leaks during reconfigure
+ - Remove origin_tries limiter on forwarding and permit large max_forward_tries values
+
Changes to squid-3.2.11 (30 Apr 2013):
- Regression Bug 3839: build error: src/tools.h: No such file or directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/RELEASENOTES.html new/squid-3.2.13/RELEASENOTES.html
--- old/squid-3.2.11/RELEASENOTES.html 2013-04-30 07:08:31.000000000 +0200
+++ new/squid-3.2.13/RELEASENOTES.html 2013-07-13 15:48:45.000000000 +0200
@@ -1,11 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<HTML>
<HEAD>
- <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.66">
- <TITLE>Squid 3.2.11 release notes</TITLE>
+ <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.69">
+ <TITLE>Squid 3.2.13 release notes</TITLE>
</HEAD>
<BODY>
-<H1>Squid 3.2.11 release notes</H1>
+<H1>Squid 3.2.13 release notes</H1>
<H2>Squid Developers</H2>
<HR>
@@ -72,7 +72,7 @@
<HR>
<H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2>
-<P>The Squid Team are pleased to announce the release of Squid-3.2.11.</P>
+<P>The Squid Team are pleased to announce the release of Squid-3.2.13.</P>
<P>This new release is available for download from
<A HREF="http://www.squid-cache.org/Versions/v3/3.2/">http://www.squid-cache.org/Versions/v3/3.2/</A> or the
<A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/configure new/squid-3.2.13/configure
--- old/squid-3.2.11/configure 2013-04-30 06:47:59.000000000 +0200
+++ new/squid-3.2.13/configure 2013-07-13 15:23:28.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.2.11.
+# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.2.13.
#
# Report bugs to <http://bugs.squid-cache.org/>.
#
@@ -575,8 +575,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.2.11'
-PACKAGE_STRING='Squid Web Proxy 3.2.11'
+PACKAGE_VERSION='3.2.13'
+PACKAGE_STRING='Squid Web Proxy 3.2.13'
PACKAGE_BUGREPORT='http://bugs.squid-cache.org/'
PACKAGE_URL=''
@@ -1571,7 +1571,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Squid Web Proxy 3.2.11 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.2.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1641,7 +1641,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 3.2.11:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 3.2.13:";;
esac
cat <<\_ACEOF
@@ -2019,7 +2019,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 3.2.11
+Squid Web Proxy configure 3.2.13
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3115,7 +3115,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Squid Web Proxy $as_me 3.2.11, which was
+It was created by Squid Web Proxy $as_me 3.2.13, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3934,7 +3934,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='3.2.11'
+ VERSION='3.2.13'
cat >>confdefs.h <<_ACEOF
@@ -30894,7 +30894,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Squid Web Proxy $as_me 3.2.11, which was
+This file was extended by Squid Web Proxy $as_me 3.2.13, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30960,7 +30960,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Squid Web Proxy config.status 3.2.11
+Squid Web Proxy config.status 3.2.13
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/configure.ac new/squid-3.2.13/configure.ac
--- old/squid-3.2.11/configure.ac 2013-04-30 06:47:59.000000000 +0200
+++ new/squid-3.2.13/configure.ac 2013-07-13 15:23:28.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([Squid Web Proxy],[3.2.11],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.2.13],[http://bugs.squid-cache.org/],[squid])
AC_PREREQ(2.61)
AC_CONFIG_HEADERS([include/autoconf.h])
AC_CONFIG_AUX_DIR(cfgaux)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/helpers/basic_auth/DB/basic_db_auth.8 new/squid-3.2.13/helpers/basic_auth/DB/basic_db_auth.8
--- old/squid-3.2.11/helpers/basic_auth/DB/basic_db_auth.8 2013-04-30 07:08:15.000000000 +0200
+++ new/squid-3.2.13/helpers/basic_auth/DB/basic_db_auth.8 2013-07-13 15:48:34.000000000 +0200
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "BASIC_DB_AUTH 1"
-.TH BASIC_DB_AUTH 1 "2013-04-29" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH BASIC_DB_AUTH 1 "2013-07-13" "perl v5.10.1" "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 new/squid-3.2.13/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8
--- old/squid-3.2.11/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2013-04-30 07:08:19.000000000 +0200
+++ new/squid-3.2.13/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2013-07-13 15:48:36.000000000 +0200
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_WBINFO_GROUP_ACL.PL.IN 1"
-.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2013-04-29" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2013-07-13" "perl v5.10.1" "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/include/version.h new/squid-3.2.13/include/version.h
--- old/squid-3.2.11/include/version.h 2013-04-30 06:47:59.000000000 +0200
+++ new/squid-3.2.13/include/version.h 2013-07-13 15:23:28.000000000 +0200
@@ -9,7 +9,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1367297224
+#define SQUID_RELEASE_TIME 1373721750
#endif
#ifndef APP_SHORTNAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/src/HttpHeader.cc new/squid-3.2.13/src/HttpHeader.cc
--- old/squid-3.2.11/src/HttpHeader.cc 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/src/HttpHeader.cc 2013-07-13 15:22:32.000000000 +0200
@@ -433,37 +433,37 @@
PROF_start(HttpHeaderClean);
- /*
- * An unfortunate bug. The entries array is initialized
- * such that count is set to zero. httpHeaderClean() seems to
- * be called both when 'hdr' is created, and destroyed. Thus,
- * we accumulate a large number of zero counts for 'hdr' before
- * it is ever used. Can't think of a good way to fix it, except
- * adding a state variable that indicates whether or not 'hdr'
- * has been used. As a hack, just never count zero-sized header
- * arrays.
- */
-
if (owner <= hoReply) {
+ /*
+ * An unfortunate bug. The entries array is initialized
+ * such that count is set to zero. httpHeaderClean() seems to
+ * be called both when 'hdr' is created, and destroyed. Thus,
+ * we accumulate a large number of zero counts for 'hdr' before
+ * it is ever used. Can't think of a good way to fix it, except
+ * adding a state variable that indicates whether or not 'hdr'
+ * has been used. As a hack, just never count zero-sized header
+ * arrays.
+ */
if (0 != entries.count)
HttpHeaderStats[owner].hdrUCountDistr.count(entries.count);
++ HttpHeaderStats[owner].destroyedCount;
HttpHeaderStats[owner].busyDestroyedCount += entries.count > 0;
+ } // if (owner <= hoReply)
- while ((e = getEntry(&pos))) {
- /* tmp hack to try to avoid coredumps */
+ while ((e = getEntry(&pos))) {
+ /* tmp hack to try to avoid coredumps */
- if (e->id < 0 || e->id >= HDR_ENUM_END) {
- debugs(55, 0, "HttpHeader::clean BUG: entry[" << pos << "] is invalid (" << e->id << "). Ignored.");
- } else {
+ if (e->id < 0 || e->id >= HDR_ENUM_END) {
+ debugs(55, DBG_CRITICAL, "HttpHeader::clean BUG: entry[" << pos << "] is invalid (" << e->id << "). Ignored.");
+ } else {
+ if (owner <= hoReply)
HttpHeaderStats[owner].fieldTypeDistr.count(e->id);
- /* yes, this deletion leaves us in an inconsistent state */
- delete e;
- }
+ /* yes, this deletion leaves us in an inconsistent state */
+ delete e;
}
- } // if (owner <= hoReply)
+ }
entries.clean();
httpHeaderMaskInit(&mask, 0);
len = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/src/MemBuf.h new/squid-3.2.13/src/MemBuf.h
--- old/squid-3.2.11/src/MemBuf.h 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/src/MemBuf.h 2013-07-13 15:22:32.000000000 +0200
@@ -66,7 +66,7 @@
/// these space-related methods assume no growth and allow 0-termination
char *space() { return buf + size; } // space to add data
- char *space(mb_size_t required) { if (size + required > capacity) grow(size + required); return buf + size; } // space to add data
+ char *space(mb_size_t required) { if (size + required >= capacity) grow(size + required +1); return buf + size; } // space to add data
mb_size_t spaceSize() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/src/client_db.cc new/squid-3.2.13/src/client_db.cc
--- old/squid-3.2.11/src/client_db.cc 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/src/client_db.cc 2013-07-13 15:22:32.000000000 +0200
@@ -72,8 +72,9 @@
clientdbAdd(const Ip::Address &addr)
{
ClientInfo *c;
- char *buf = new char[MAX_IPSTRLEN];
+ char *buf = static_cast<char*>(xmalloc(MAX_IPSTRLEN)); // becomes hash.key
c = (ClientInfo *)memAllocate(MEM_CLIENT_INFO);
+ debugs(77, 9, "ClientInfo constructed, this=" << c);
c->hash.key = addr.NtoA(buf,MAX_IPSTRLEN);
c->addr = addr;
#if USE_DELAY_POOLS
@@ -355,6 +356,7 @@
}
#endif
+ debugs(77, 9, "ClientInfo destructed, this=" << c);
memFree(c, MEM_CLIENT_INFO);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/src/client_side_request.cc new/squid-3.2.13/src/client_side_request.cc
--- old/squid-3.2.11/src/client_side_request.cc 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/src/client_side_request.cc 2013-07-13 15:22:32.000000000 +0200
@@ -641,8 +641,16 @@
uint16_t port = 0;
if (portStr) {
*portStr = '\0'; // strip the ':'
- if (*(++portStr) != '\0')
- port = xatoi(portStr);
+ if (*(++portStr) != '\0') {
+ char *end = NULL;
+ int64_t ret = strtoll(portStr, &end, 10);
+ if (end == portStr || *end != '\0' || ret < 1 || ret > 0xFFFF) {
+ // invalid port details. Replace the ':'
+ *(--portStr) = ':';
+ portStr = NULL;
+ } else
+ port = (ret & 0xFFFF);
+ }
}
debugs(85, 3, HERE << "validate host=" << host << ", port=" << port << ", portStr=" << (portStr?portStr:"NULL"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/src/dns_internal.cc new/squid-3.2.13/src/dns_internal.cc
--- old/squid-3.2.11/src/dns_internal.cc 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/src/dns_internal.cc 2013-07-13 15:22:32.000000000 +0200
@@ -1660,23 +1660,29 @@
void
idnsALookup(const char *name, IDNSCB * callback, void *data)
{
- unsigned int i;
- int nd = 0;
- idns_query *q;
+ size_t nameLength = strlen(name);
+
+ // Prevent buffer overflow on q->name
+ if (nameLength > NS_MAXDNAME) {
+ debugs(23, DBG_IMPORTANT, "SECURITY ALERT: DNS name too long to perform lookup: '" << name << "'. see access.log for details.");
+ callback(data, NULL, 0, "Internal error");
+ return;
+ }
if (idnsCachedLookup(name, callback, data))
return;
- q = cbdataAlloc(idns_query);
+ idns_query *q = cbdataAlloc(idns_query);
// idns_query is POD so no constructors are called after allocation
q->xact_id.change();
q->query_id = idnsQueryID();
- for (i = 0; i < strlen(name); ++i)
+ int nd = 0;
+ for (unsigned int i = 0; i < nameLength; ++i)
if (name[i] == '.')
++nd;
- if (Config.onoff.res_defnames && npc > 0 && name[strlen(name)-1] != '.') {
+ if (Config.onoff.res_defnames && npc > 0 && name[nameLength-1] != '.') {
q->do_searchpath = 1;
} else {
q->do_searchpath = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/src/forward.cc new/squid-3.2.13/src/forward.cc
--- old/squid-3.2.11/src/forward.cc 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/src/forward.cc 2013-07-13 15:22:32.000000000 +0200
@@ -515,10 +515,7 @@
if (!entry->isEmpty())
return false;
- if (n_tries > 10)
- return false;
-
- if (origin_tries > 2)
+ if (n_tries > Config.forward_max_tries)
return false;
if (squid_curtime - start_t > Config.Timeout.forward)
@@ -940,9 +937,6 @@
debugs(17, 3, HERE << "reusing pconn " << serverConnection());
++n_tries;
- if (!serverConnection()->getPeer())
- ++origin_tries;
-
comm_add_close_handler(serverConnection()->fd, fwdServerClosedWrapper, this);
/* Update server side TOS and Netfilter mark on the connection. */
@@ -1131,9 +1125,6 @@
if (n_tries > Config.forward_max_tries)
return 0;
- if (origin_tries > 1)
- return 0;
-
if (request->bodyNibbled())
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/src/forward.h new/squid-3.2.13/src/forward.h
--- old/squid-3.2.11/src/forward.h 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/src/forward.h 2013-07-13 15:22:32.000000000 +0200
@@ -97,7 +97,6 @@
Comm::ConnectionPointer clientConn; ///< a possibly open connection to the client.
time_t start_t;
int n_tries;
- int origin_tries;
// AsyncCalls which we set and may need cancelling.
struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.11/src/helper.cc new/squid-3.2.13/src/helper.cc
--- old/squid-3.2.11/src/helper.cc 2013-04-30 06:47:06.000000000 +0200
+++ new/squid-3.2.13/src/helper.cc 2013-07-13 15:22:32.000000000 +0200
@@ -38,6 +38,7 @@
#include "comm/Connection.h"
#include "comm/Write.h"
#include "helper.h"
+#include "fde.h"
#include "format/Quoting.h"
#include "MemBuf.h"
#include "SquidMath.h"
@@ -750,7 +751,7 @@
safe_free(srv->requests);
cbdataReferenceDone(srv->parent);
- cbdataFree(srv);
+ delete srv;
}
static void
@@ -812,7 +813,7 @@
cbdataReferenceDone(srv->parent);
- cbdataFree(srv);
+ delete srv;
}
/// Calls back with a pointer to the buffer with the helper output
@@ -920,7 +921,7 @@
helperReturnBuffer(i, srv, hlp, msg, t);
}
- if (Comm::IsConnOpen(srv->readPipe)) {
+ if (Comm::IsConnOpen(srv->readPipe) && !fd_table[srv->readPipe->fd].closing()) {
int spaceSize = srv->rbuf_sz - srv->roffset - 1;
assert(spaceSize >= 0);
@@ -1021,7 +1022,7 @@
helperStatefulReleaseServer(srv);
}
- if (Comm::IsConnOpen(srv->readPipe)) {
+ if (Comm::IsConnOpen(srv->readPipe) && !fd_table[srv->readPipe->fd].closing()) {
int spaceSize = srv->rbuf_sz - srv->roffset - 1;
assert(spaceSize >= 0);
++++++ squid-3.2.11.tar.bz2.asc -> squid-3.2.13.tar.bz2.asc ++++++
--- /work/SRC/openSUSE:Factory/squid/squid-3.2.11.tar.bz2.asc 2013-05-13 15:37:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.squid.new/squid-3.2.13.tar.bz2.asc 2013-07-30 16:48:26.000000000 +0200
@@ -1,8 +1,8 @@
-File: squid-3.2.11.tar.bz2
-Date: Tue Apr 30 05:08:44 UTC 2013
-Size: 2897354
-MD5 : cdd3612bed27e8d513b713004c78bf5b
-SHA1: 124c0af704f88afb2feb5054b36f253544173a4b
+File: squid-3.2.13.tar.bz2
+Date: Sat Jul 13 13:49:04 UTC 2013
+Size: 2898293
+MD5 : 367e59c9c25da7ebbfbf7cbc36d2444e
+SHA1: f253df4981981c297cc7e719908e07b046506952
Key : 0xFF5CF463 <squid3(a)treenet.co.nz>
fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463
keyring = http://www.squid-cache.org/pgp.asc
@@ -10,11 +10,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
-iQEcBAABAgAGBQJRf1OIAAoJELJo5wb/XPRjwg4H/iNZaKfeqRLVtpFOXT0RKY+l
-4+FVq1ptu6VLXRtkJWAj5RZfk6hmO9G+ZwZTnZWLf46c6kUvB/4Nlt0LD98FB9ng
-ZtWfcTSked7idj3pInjMvNNa7j0qeOy4tvjUvxKtPAg2ZiRJXoPOKkS6TXnyyGvf
-zlSWqmFUNvBsVULGALk9stq03jxqzf2CamNho8g2Tly//suJr8aHj38E8oMoCHWX
-SCjo9yVTRdZjaGa6RKkyMGYpPpM9Wh4qIixAGT6Ih94YxzXg/mcWpcl6A6Pwc8CT
-lrkKV2mDuGMoL1gGWYo8pUCEjvzKjRtoevu1wjzX/mqYbpilfLNnGg3vqZu7pfM=
-=mQwq
+iQEcBAABAgAGBQJR4VuSAAoJELJo5wb/XPRjDMsH+gN9MyL0RAegBfeJtScW7dOU
+E7ZPl8BjUqYTOoLPxXX95MTm6gJzzZ69S6ss8+db4fYd6kbGgkX/G05R0E5PBQJG
+2OnJU1LUUzBcqTedai1SCuL90gVgy7oqzke6qlT43SSzuKPzmvlrtnBOrXK1guy0
+xCFNFRtuZKIUVAyERlgE6tP0iPn5DZqSqGwGOx/lkNB20bgx83Amy7uav1F/d9Ps
+sillN9btek4azrPqyqDXoSv+Tqh0u3Ni+zSQJrbVJ59QGFA38OLdW3i3MphgNg5N
+/HkAGnfsCzJHQlxoM5kKz11U4caIv57gy9ZXIJ8peIIldOiLrfG1zcL/awyQVJc=
+=hNXf
-----END PGP SIGNATURE-----
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package sbcl for openSUSE:Factory checked in at 2013-07-30 16:48:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sbcl (Old)
and /work/SRC/openSUSE:Factory/.sbcl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbcl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sbcl/sbcl.changes 2013-07-04 18:07:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sbcl.new/sbcl.changes 2013-07-30 16:48:04.000000000 +0200
@@ -1,0 +2,26 @@
+Mon Jul 29 07:11:41 UTC 2013 - toganm(a)opensuse.org
+
+- Update to version 1.1.10
+
+ * Enhancement:
+ + ASDF has been updated to 3.0.2.
+ * Optimization:
+ + stack frames are packed more efficiently on
+ x86oids, which ought to reduce the frequency of Methuselahn
+ conservative references (it certainly helps with gc.impure.lisp
+ / BUG-936304 on x86).
+ + on x86 and x86-64, integer negation forms like
+ (- * x) are now recognized in modular arithmetic contexts, and
+ compile to native negate, rather than going through bignums only
+ to keep the low bits.
+ * Bug fix
+ + Compiling potential modularic arithmetic forms does
+ not cause type errors when some integer types lack lower or upper
+ bounds. (lp#1199127)
+ + Non-trivial modular arithmetic forms are always cut to
+ the right bitwidth before being used in a non-modular context.
+ (lp#1199428)
+ + Multiple catch/unwind blocks in a single function are now
+ allocated in the right stack order on win32. (lp#1072739)
+
+-------------------------------------------------------------------
Old:
----
sbcl-1.1.9-source.tar.bz2
New:
----
sbcl-1.1.10-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sbcl.spec ++++++
--- /var/tmp/diff_new_pack.DGiYhG/_old 2013-07-30 16:48:05.000000000 +0200
+++ /var/tmp/diff_new_pack.DGiYhG/_new 2013-07-30 16:48:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: sbcl
-Version: 1.1.9
+Version: 1.1.10
Release: 0
Summary: Steel Bank Common Lisp
License: SUSE-Public-Domain and BSD-3-Clause
++++++ sbcl-1.1.9-source.tar.bz2 -> sbcl-1.1.10-source.tar.bz2 ++++++
++++ 16654 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2013-07-30 16:47:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpmlint (Old)
and /work/SRC/openSUSE:Factory/.rpmlint.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2013-07-23 18:36:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2013-07-30 16:47:40.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 29 12:28:19 UTC 2013 - meissner(a)suse.com
+
+- allow systemd machined service as-is (bnc#828207)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ config ++++++
--- /var/tmp/diff_new_pack.WQUdVQ/_old 2013-07-30 16:47:42.000000000 +0200
+++ /var/tmp/diff_new_pack.WQUdVQ/_new 2013-07-30 16:47:42.000000000 +0200
@@ -561,6 +561,9 @@
"wicked-dhcp6.conf",
"wicked-autoip4.conf",
"wicked.conf",
+ # systemd machined service (bnc#828207)
+ "org.freedesktop.machine1.service",
+ "org.freedesktop.machine1.conf",
))
setOption("PAMModules.WhiteList", (
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2013-07-30 16:47:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old)
and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2013-07-07 22:21:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2013-07-30 16:47:16.000000000 +0200
@@ -1,0 +2,22 @@
+Mon Jul 29 20:07:45 UTC 2013 - chris(a)computersalat.de
+
+- fix for bnc#831896
+ * multiple XSS issues (+ a SQL injection and full path disclosure flaw)
+ * fix for PMASA-2013-9 (CWE-661 CWE-79 CWE-80)
+ * fix for PMASA-2013-11 (CWE-300 CWE-79)
+ * fix for PMASA-2013-12 (CWE-661 CWE-200)
+ * fix for PMASA-2013-13 (CWE-661 CWE-79 CWE-80)
+ * fix for PMASA-2013-14 (CWE-661 CWE-79)
+ * fix for PMASA-2013-15 (CWE-661 CWE-89 CWE-269)
+- update to 4.0.4.2 (2013-07-28)
+ * [security] Fix stored XSS in Server status monitor, see PMASA-2013-9
+ * [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9
+ * [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9
+ * [security] Fix full path disclosure, see PMASA-2013-12
+ * [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15
+ * [security] Fix control user SQL injection in schema_export.php, see PMASA-2013-15
+ * [security] Fix self-XSS in schema export, see PMASA-2013-14
+ * [security] Fix unencoded json object, see PMASA-2013-11
+ * [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13
+
+-------------------------------------------------------------------
Old:
----
phpMyAdmin-4.0.4.1-all-languages.tar.bz2
New:
----
phpMyAdmin-4.0.4.2-all-languages.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.vRoDOk/_old 2013-07-30 16:47:17.000000000 +0200
+++ /var/tmp/diff_new_pack.vRoDOk/_new 2013-07-30 16:47:17.000000000 +0200
@@ -34,7 +34,7 @@
Summary: Administration of MySQL over the web
License: GPL-2.0+
Group: Productivity/Networking/Web/Frontends
-Version: 4.0.4.1
+Version: 4.0.4.2
Release: 0
Url: http://www.phpMyAdmin.net
Source0: %{name}-%{version}-all-languages.tar.bz2
@@ -104,8 +104,6 @@
find . -type d -exec chmod 755 {} \;
find . -type f -exec chmod 644 {} \;
find . -type f -name '*.orig' -exec rm {} \;
-#rm lang/*.sh
-%{__rm} libraries/.htaccess
%build
++++++ phpMyAdmin-4.0.4.1-all-languages.tar.bz2 -> phpMyAdmin-4.0.4.2-all-languages.tar.bz2 ++++++
++++ 11935 lines of diff (skipped)
++++++ phpMyAdmin-config.patch ++++++
--- /var/tmp/diff_new_pack.vRoDOk/_old 2013-07-30 16:47:19.000000000 +0200
+++ /var/tmp/diff_new_pack.vRoDOk/_new 2013-07-30 16:47:19.000000000 +0200
@@ -1,5 +1,7 @@
---- config.sample.inc.php.orig 2013-05-03 14:16:36.000000000 +0200
-+++ config.sample.inc.php 2013-05-03 20:13:46.549034257 +0200
+Index: config.sample.inc.php
+===================================================================
+--- config.sample.inc.php.orig
++++ config.sample.inc.php
@@ -11,10 +11,51 @@
*/
@@ -22,20 +24,20 @@
+ * $cfg['PmaAbsoluteUri_DisableWarning'] variable below.
+ */
+$cfg['PmaAbsoluteUri'] = '';
-+
++
+/*
* This is needed for cookie based authentication to encrypt password in
* cookie
+ * YOU MUST FILL IN THIS FOR COOKIE AUTH!
- */
--$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
++ */
+$cfg['blowfish_secret'] = '';
+
+/*
+ * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set
+ * You should use this if and ONLY if the PmaAbsoluteUri auto-detection
+ * works perfectly.
-+ */
+ */
+-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['PmaAbsoluteUri_DisableWarning'] = false;
+
+/*
@@ -133,30 +135,12 @@
* phpMyAdmin configuration storage settings.
*/
+$cfg['Servers'][$i]['controlhost'] = '';
-
--/* User used to manipulate with storage */
--// $cfg['Servers'][$i]['controlhost'] = '';
--// $cfg['Servers'][$i]['controluser'] = 'pma';
--// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
++
+// MySQL control user settings (this user must have read-only
+// access to the "mysql/user" and "mysql/db" tables).
+// The controluser is also used for all relational features (pmadb)
+$cfg['Servers'][$i]['controluser'] = '';
-
--/* Storage database and tables */
--// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
--// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
--// $cfg['Servers'][$i]['relation'] = 'pma__relation';
--// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
--// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
--// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
--// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
--// $cfg['Servers'][$i]['history'] = 'pma__history';
--// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
--// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
--// $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords';
--// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
--// $cfg['Servers'][$i]['recent'] = 'pma__recent';
++
+// The password needed for the controluser to login
+// (see $cfg['Servers'][$i]['controluser'])
+$cfg['Servers'][$i]['controlpass'] = '';
@@ -235,7 +219,26 @@
+// used tables, but it will disappear after you logout.
+// DEFAULT: 'pma_recent'
+$cfg['Servers'][$i]['recent'] = 'pma_recent';
-+
+
+-/* User used to manipulate with storage */
+-// $cfg['Servers'][$i]['controlhost'] = '';
+-// $cfg['Servers'][$i]['controluser'] = 'pma';
+-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
+-
+-/* Storage database and tables */
+-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
+-// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
+-// $cfg['Servers'][$i]['relation'] = 'pma__relation';
+-// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
+-// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
+-// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
+-// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
+-// $cfg['Servers'][$i]['history'] = 'pma__history';
+-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
+-// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
+-// $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords';
+-// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
+-// $cfg['Servers'][$i]['recent'] = 'pma__recent';
/* Contrib / Swekey authentication */
-// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
+// The name of the file containing Swekey ids and login names for
@@ -276,7 +279,7 @@
/*
+ * phpMyAdmin configuration storage settings.
+ */
-+
++
+/*
+$cfg['Servers'][$i]['controlhost'] = '';
+$cfg['Servers'][$i]['controluser'] = '';
@@ -312,8 +315,10 @@
* End of servers configuration
*/
---- libraries/vendor_config.php.orig 2013-05-03 14:16:36.000000000 +0200
-+++ libraries/vendor_config.php 2013-05-03 19:57:54.344938439 +0200
+Index: libraries/vendor_config.php
+===================================================================
+--- libraries/vendor_config.php.orig
++++ libraries/vendor_config.php
@@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) {
* Path to changelog file, can be gzip compressed. Useful when you want to
* have documentation somewhere else, eg. /usr/share/doc.
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package perl-Package-Generator for openSUSE:Factory checked in at 2013-07-30 16:46:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Package-Generator (Old)
and /work/SRC/openSUSE:Factory/.perl-Package-Generator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Package-Generator"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Package-Generator/perl-Package-Generator.changes 2011-12-08 14:46:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-Package-Generator.new/perl-Package-Generator.changes 2013-07-30 16:46:46.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Jul 27 11:58:32 UTC 2013 - coolo(a)suse.com
+
+- updated to 1.105
+ oops, re-repackage, dropping pod tests
+ repackage, update bug tracker
+
+-------------------------------------------------------------------
Old:
----
Package-Generator-0.103.tar.gz
New:
----
Package-Generator-1.105.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Package-Generator.spec ++++++
--- /var/tmp/diff_new_pack.wqoNcG/_old 2013-07-30 16:46:47.000000000 +0200
+++ /var/tmp/diff_new_pack.wqoNcG/_new 2013-07-30 16:46:47.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Package-Generator
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,40 +17,30 @@
Name: perl-Package-Generator
-%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' )
-Summary: Generate new packages quickly and easily
-License: GPL-1.0+ or Artistic-1.0
-Group: Development/Libraries/Perl
-Version: 0.103
+Version: 1.105
Release: 0
-Url: http://search.cpan.org/dist/Package-Generator
-Source: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Package-Generator-0.103.ta…
+%define cpan_name Package-Generator
+Summary: generate new packages quickly and easily
+License: Artistic-1.0 or GPL-1.0+
+Group: Development/Libraries/Perl
+Url: http://search.cpan.org/dist/Package-Generator/
+Source: http://www.cpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%{perl_requires}
BuildRequires: perl
-BuildRequires: perl(Scalar::Util)
-BuildRequires: perl(Test::More)
-BuildRequires: perl(Test::Pod) >= 1.14
-BuildRequires: perl(Test::Pod::Coverage) >= 1.06
BuildRequires: perl-macros
-#
-Requires: perl(Scalar::Util)
-Requires: perl(Test::More)
+BuildRequires: perl(Test::More) >= 0.96
+%{perl_requires}
%description
-This module lets you quickly and easily construct new packages.
-It gives them unused names and sets up their package data,
-if provided.
-
- Author: Ricardo Signes, <rjbs(a)cpan.org>
-
+This module lets you quickly and easily construct new packages. It gives
+them unused names and sets up their package data, if provided.
%prep
%setup -q -n %{cpan_name}-%{version}
%build
-%{__perl} Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}
%check
@@ -58,19 +48,11 @@
%install
%perl_make_install
-# do not perl_process_packlist (noarch)
-# remove .packlist file
-%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch
-# remove perllocal.pod file
-%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib
+%perl_process_packlist
%perl_gen_filelist
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
%files -f %{name}.files
-# normally you only need to check for doc files
-%defattr(-,root,root)
+%defattr(-,root,root,755)
%doc Changes LICENSE README
%changelog
++++++ Package-Generator-0.103.tar.gz -> Package-Generator-1.105.tar.gz ++++++
++++ 3790 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package perl-Net-Whois-RIPE for openSUSE:Factory checked in at 2013-07-30 16:46:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Net-Whois-RIPE (Old)
and /work/SRC/openSUSE:Factory/.perl-Net-Whois-RIPE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Net-Whois-RIPE"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Net-Whois-RIPE/perl-Net-Whois-RIPE.changes 2011-12-01 12:25:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-Net-Whois-RIPE.new/perl-Net-Whois-RIPE.changes 2013-07-30 16:46:39.000000000 +0200
@@ -1,0 +2,33 @@
+Sat Jul 27 11:58:51 UTC 2013 - coolo(a)suse.com
+
+- updated to 2.004001
+ - Remove Test::Exception requirement
+ - Add one test
+ - Fix 'delete' mode on accessor
+ - Add awhois.pl skeleton script
+ Another contribution from Moritz Lenz :
+ - Add abuse_c field to Organisation
+ - Inet6num has an attribute 'assignment_size'
+ - Unknown attributes in Object->new do not die anymore
+ - Add 'delete' mode to attribute update
+ - Minor documentation fix
+ - Add the clone() method to Net::Whois::Object
+ - Enhance accessor for multiple value attributes
+ (enable multiple values in default append mode, add a replace mode)
+ - Add a README.md skeleton for github
+ - Changes date format in Changes file
+ (to comply to Test-Changes spec)
+ - Add new attributes (geoloc, language, abuse_mailbox) to Organisation object
+ Add 'geoloc', 'language', 'abuse_mailbox' to the Organisation object
+ Add 'org' to the PeeringSet object
+ Add 'org' attribute to the RtrSet object
+ Add 'org' attribute to the RouteSet object
+ Add 'pingable', 'ping_hdl' and 'org' attribute to the Route(6) objects
+ Add 'org' attribute to the Role object
+ Add 'org' and 'abuse_mailbox' attribute to the Person object
+ Add 'geoloc' and 'language' attribute to the InetNum object
+ Add 'geoloc' and 'language' attribute to Inet6Num object
+ Add 'org' and 'mnt_lower' attribute to AsSet object
+ Update tests accordingly
+
+-------------------------------------------------------------------
Old:
----
Net-Whois-RIPE-2.00009.tar.gz
New:
----
Net-Whois-RIPE-2.004001.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Net-Whois-RIPE.spec ++++++
--- /var/tmp/diff_new_pack.KXdq2a/_old 2013-07-30 16:46:40.000000000 +0200
+++ /var/tmp/diff_new_pack.KXdq2a/_new 2013-07-30 16:46:40.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Net-Whois-RIPE
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,56 +16,47 @@
#
-
Name: perl-Net-Whois-RIPE
-Version: 2.00009
-Release: 1
-License: GPL-1.0+ or Artistic-1.0
+Version: 2.004001
+Release: 0
%define cpan_name Net-Whois-RIPE
-Summary: A pure-Perl implementation of the RIPE Database client
-Url: http://search.cpan.org/dist/Net-Whois-RIPE/
+Summary: a pure-Perl implementation of the RIPE Database client.
+License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
-#Source: http://www.cpan.org/authors/id/L/LM/LMC/Net-Whois-RIPE-%{version}.tar.gz
-Source: %{cpan_name}-%{version}.tar.gz
+Url: http://search.cpan.org/dist/Net-Whois-RIPE/
+Source: http://www.cpan.org/authors/id/A/AA/AASSAD/%{cpan_name}-%{version}.tar.gz
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
-BuildRequires: perl(Iterator)
-BuildRequires: perl(Iterator::Util)
-BuildRequires: perl(Test::Exception)
-BuildRequires: perl(Test::More)
BuildRequires: perl-macros
-Requires: perl(IO::Select)
-Requires: perl(IO::Socket::INET)
+BuildRequires: perl(Iterator)
+#BuildRequires: perl(LWP::UserAgent)
+#BuildRequires: perl(Net::Whois::Object)
+#BuildRequires: perl(Net::Whois::RIPE)
Requires: perl(Iterator)
-Requires: perl(Iterator::Util)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
+Recommends: perl(LWP::UserAgent)
%{perl_requires}
%description
-It intends to provide a cleaner, simpler, and complete implementation
-of a RIPE Database client.
+a pure-Perl implementation of the RIPE Database client.
%prep
-%setup -n %{cpan_name}-%{version}
+%setup -q -n %{cpan_name}-%{version}
%build
-perl Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__make} %{?_smp_mflags}
-#check
-# tests fail, because they require network connection
-#{__make} test
+%check
+%{__make} test
%install
%perl_make_install
%perl_process_packlist
%perl_gen_filelist
-%clean
-rm -rf %{buildroot}
-
%files -f %{name}.files
-%defattr(644,root,root,755)
-%doc Changes README
+%defattr(-,root,root,755)
+%doc Changes README README.md
%changelog
++++++ Net-Whois-RIPE-2.00009.tar.gz -> Net-Whois-RIPE-2.004001.tar.gz ++++++
++++ 10167 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0