September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit mozilla-nss for openSUSE:12.3:Update
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package mozilla-nss for openSUSE:12.3:Update checked in at 2014-09-26 14:20:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/mozilla-nss (Old) and /work/SRC/openSUSE:12.3:Update/.mozilla-nss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nss" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.AT7Z40/_old 2014-09-26 14:20:41.000000000 +0200 +++ /var/tmp/diff_new_pack.AT7Z40/_new 2014-09-26 14:20:41.000000000 +0200 @@ -1 +1 @@ -<link package='mozilla-nss.2982' cicount='copy' /> +<link package='mozilla-nss.3024' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-nss.3024 for openSUSE:12.3:Update
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package mozilla-nss.3024 for openSUSE:12.3:Update checked in at 2014-09-26 14:20:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/mozilla-nss.3024 (Old) and /work/SRC/openSUSE:12.3:Update/.mozilla-nss.3024.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nss.3024" Changes: -------- New Changes file: --- /dev/null 2014-09-26 12:09:11.568032006 +0200 +++ /work/SRC/openSUSE:12.3:Update/.mozilla-nss.3024.new/mozilla-nss.changes 2014-09-26 14:20:38.000000000 +0200 @@ -0,0 +1,1039 @@ +------------------------------------------------------------------- +Tue Sep 23 21:44:44 UTC 2014 - wr(a)rosenauer.org + +- update to 3.16.5 (bnc#897890) + * MFSA 2014-73/CVE-2014-1568 (bmo#1064636, bmo#1069405) + RSA Signature Forgery in NSS + +------------------------------------------------------------------- +Tue Aug 12 10:56:55 UTC 2014 - wr(a)rosenauer.org + +- update to 3.16.4 (bnc#894201) + * now required for Firefox 32 + Notable Changes: + * The following 1024-bit root CA certificate was restored to allow more + time to develop a better transition strategy for affected sites. It was + removed in NSS 3.16.3, but discussion in the mozilla.dev.security.policy + forum led to the decision to keep this root included longer in order to + give website administrators more time to update their web servers. + - CN = GTE CyberTrust Global Root + * In NSS 3.16.3, the 1024-bit "Entrust.net Secure Server Certification + Authority" root CA certificate was removed. In NSS 3.16.4, a 2048-bit + intermediate CA certificate has been included, without explicit trust. + The intention is to mitigate the effects of the previous removal of the + 1024-bit Entrust.net root certificate, because many public Internet + sites still use the "USERTrust Legacy Secure Server CA" intermediate + certificate that is signed by the 1024-bit Entrust.net root certificate. + The inclusion of the intermediate certificate is a temporary measure to + allow those sites to function, by allowing them to find a trust path to + another 2048-bit root CA certificate. The temporarily included + intermediate certificate expires November 1, 2015. + +------------------------------------------------------------------- +Sat Jul 5 12:10:36 UTC 2014 - wr(a)rosenauer.org + +- update to 3.16.3 + * required for Firefox 32 + New Functions: + * CERT_GetGeneralNameTypeFromString (This function was already added + in NSS 3.16.2, however, it wasn't declared in a public header file.) + Notable Changes: + * The following 1024-bit CA certificates were removed + - Entrust.net Secure Server Certification Authority + - GTE CyberTrust Global Root + - ValiCert Class 1 Policy Validation Authority + - ValiCert Class 2 Policy Validation Authority + - ValiCert Class 3 Policy Validation Authority + * Additionally, the following CA certificate was removed as + requested by the CA: + - TDC Internet Root CA + * The following CA certificates were added: + - Certification Authority of WoSign + - CA 沃通根证书 + - DigiCert Assured ID Root G2 + - DigiCert Assured ID Root G3 + - DigiCert Global Root G2 + - DigiCert Global Root G3 + - DigiCert Trusted Root G4 + - QuoVadis Root CA 1 G3 + - QuoVadis Root CA 2 G3 + - QuoVadis Root CA 3 G3 + * The Trust Bits were changed for the following CA certificates + - Class 3 Public Primary Certification Authority + - Class 3 Public Primary Certification Authority + - Class 2 Public Primary Certification Authority - G2 + - VeriSign Class 2 Public Primary Certification Authority - G3 + - AC Raíz Certicámara S.A. + - NetLock Uzleti (Class B) Tanusitvanykiado + - NetLock Expressz (Class C) Tanusitvanykiado +- changes in 3.16.2 + New functionality: + * DTLS 1.2 is supported. + * The TLS application layer protocol negotiation (ALPN) extension + is also supported on the server side. + * RSA-OEAP is supported. Use the new PK11_PrivDecrypt and + PK11_PubEncrypt functions with the CKM_RSA_PKCS_OAEP mechanism. + * New Intel AES assembly code for 32-bit and 64-bit Windows, + contributed by Shay Gueron and Vlad Krasnov of Intel. + New Functions: + * CERT_AddExtensionByOID + * PK11_PrivDecrypt + * PK11_PubEncrypt + New Macros + * SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK + * SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL + Notable Changes: + * The btoa command has a new command-line option -w suffix, which + causes the output to be wrapped in BEGIN/END lines with the + given suffix + * The certutil commands supports additionals types of subject + alt name extensions. + * The certutil command supports generic certificate extensions, + by loading binary data from files, which have been prepared using + external tools, or which have been extracted from other existing + certificates and dumped to file. + * The certutil command supports three new certificate usage specifiers. + * The pp command supports printing UTF-8 (-u). + * On Linux, NSS is built with the -ffunction-sections -fdata-sections + compiler flags and the --gc-sections linker flag to allow unused + functions to be discarded. + +------------------------------------------------------------------- +Thu May 8 05:46:17 UTC 2014 - wr(a)rosenauer.org + +- update to 3.16.1 + * required for Firefox 31 + New functionality: + * Added the "ECC" flag for modutil to select the module used for + elliptic curve cryptography (ECC) operations. + New Functions: + * PK11_ExportDERPrivateKeyInfo/PK11_ExportPrivKeyInfo + exports a private key in a DER-encoded ASN.1 PrivateKeyInfo type + or a SECKEYPrivateKeyInfo structure. Only RSA private keys are + supported now. + * SECMOD_InternalToPubMechFlags + converts from NSS-internal to public representation of mechanism + flags + New Types: + * ssl_padding_xtn + the value of this enum constant changed from the experimental + value 35655 to the IANA-assigned value 21 + New Macros + * PUBLIC_MECH_ECC_FLAG + a public mechanism flag for elliptic curve cryptography (ECC) + operations + * SECMOD_ECC_FLAG + an NSS-internal mechanism flag for elliptic curve cryptography + (ECC) operations. This macro has the same numeric value as + PUBLIC_MECH_ECC_FLAG. + Notable Changes: + * Imposed name constraints on the French government root CA ANSSI + (DCISS). + +------------------------------------------------------------------- +Fri Mar 21 21:16:31 UTC 2014 - wr(a)rosenauer.org + +- update to 3.16 + * required for Firefox 29 + * bmo#903885 - (CVE-2014-1492) In a wildcard certificate, the wildcard + character should not be embedded within the U-label of an + internationalized domain name. See the last bullet point in RFC 6125, + Section 7.2. + * Supports the Linux x32 ABI. To build for the Linux x32 target, set + the environment variable USE_X32=1 when building NSS. + New Functions: + * NSS_CMSSignerInfo_Verify + New Macros + * TLS_RSA_WITH_RC4_128_SHA, TLS_RSA_WITH_3DES_EDE_CBC_SHA, etc., + cipher suites that were first defined in SSL 3.0 can now be referred + to with their official IANA names in TLS, with the TLS_ prefix. + Previously, they had to be referred to with their names in SSL 3.0, + with the SSL_ prefix. + Notable Changes: + * ECC is enabled by default. It is no longer necessary to set the + environment variable NSS_ENABLE_ECC=1 when building NSS. To disable + ECC, set the environment variable NSS_DISABLE_ECC=1 when building NSS. + * libpkix should not include the common name of CA as DNS names when + evaluating name constraints. + * AESKeyWrap_Decrypt should not return SECSuccess for invalid keys. + * Fix a memory corruption in sec_pkcs12_new_asafe. + * If the NSS_SDB_USE_CACHE environment variable is set, skip the runtime + test sdb_measureAccess. + * The built-in roots module has been updated to version 1.97, which + adds, removes, and distrusts several certificates. + * The atob utility has been improved to automatically ignore lines of + text that aren't in base64 format. + * The certutil utility has been improved to support creation of + version 1 and version 2 certificates, in addition to the existing + version 3 support. + +------------------------------------------------------------------- +Tue Feb 25 11:31:18 UTC 2014 - wr(a)rosenauer.org + +- update to 3.15.5 + * required for Firefox 28 + * export FREEBL_LOWHASH to get the correct default headers + (bnc#865539) + New functionality + * Added support for the TLS application layer protocol negotiation + (ALPN) extension. Two SSL socket options, SSL_ENABLE_NPN and + SSL_ENABLE_ALPN, can be used to control whether NPN or ALPN (or both) + should be used for application layer protocol negotiation. + * Added the TLS padding extension. The extension type value is 35655, + which may change when an official extension type value is assigned + by IANA. NSS automatically adds the padding extension to ClientHello + when necessary. + * Added a new macro CERT_LIST_TAIL, defined in certt.h, for getting + the tail of a CERTCertList. + Notable Changes + * bmo#950129: Improve the OCSP fetching policy when verifying OCSP + responses + * bmo#949060: Validate the iov input argument (an array of PRIOVec + structures) of ssl_WriteV (called via PR_Writev). Applications should + still take care when converting struct iov to PRIOVec because the + iov_len members of the two structures have different types + (size_t vs. int). size_t is unsigned and may be larger than int. + +------------------------------------------------------------------- ++++ 842 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.mozilla-nss.3024.new/mozilla-nss.changes New: ---- baselibs.conf cert9.db key4.db malloc.patch mozilla-nss-rpmlintrc mozilla-nss.changes mozilla-nss.spec nss-3.16.5.tar.gz nss-config.in nss-disable-ocsp-test.patch nss-no-rpath.patch nss-opt.patch nss-sqlitename.patch nss.pc.in pkcs11.txt renegotiate-transitional.patch setup-nsssysinit.sh system-nspr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nss.spec ++++++ # # spec file for package mozilla-nss # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006-2014 Wolfgang Rosenauer # # 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/ # %global nss_softokn_fips_version 3.12.4 Name: mozilla-nss BuildRequires: gcc-c++ BuildRequires: mozilla-nspr-devel >= 4.10.5 BuildRequires: pkg-config BuildRequires: sqlite-devel BuildRequires: zlib-devel Version: 3.16.5 Release: 0 # bug437293 %ifarch ppc64 Obsoletes: mozilla-nss-64bit %endif # Summary: Network Security Services License: MPL-2.0 Group: System/Libraries Url: http://www.mozilla.org/projects/security/pki/nss/ #Source: https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_5_RT… # hg clone https://hg.mozilla.org/projects/nss nss-3.16.5/nss ; cd nss-3.16.5/nss ; hg up NSS_3_16_5_RTM Source: nss-%{version}.tar.gz Source1: nss.pc.in Source3: nss-config.in Source4: %{name}-rpmlintrc Source5: baselibs.conf Source6: setup-nsssysinit.sh Source7: cert9.db Source8: key4.db Source9: pkcs11.txt #Source10: PayPalEE.cert Patch1: nss-opt.patch Patch2: system-nspr.patch Patch4: nss-no-rpath.patch Patch5: renegotiate-transitional.patch Patch6: malloc.patch Patch7: nss-disable-ocsp-test.patch Patch8: nss-sqlitename.patch %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) PreReq: mozilla-nspr >= %nspr_ver PreReq: libfreebl3 >= %{nss_softokn_fips_version} PreReq: libsoftokn3 >= %{nss_softokn_fips_version} %if %{_lib} == lib64 Requires: libnssckbi.so()(64bit) %else Requires: libnssckbi.so %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nssdbdir %{_sysconfdir}/pki/nssdb %ifnarch %sparc %if ! 0%{?qemu_user_space_build} %define run_testsuite 1 %endif %endif %description Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled server applications. Applications built with NSS can support SSL v3, TLS v1.0, v1.1, v1.2, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. %package devel Summary: Network (Netscape) Security Services development files Group: Development/Libraries/Other Requires: libfreebl3 Requires: libsoftokn3 Requires: mozilla-nspr-devel >= 4.9 Requires: mozilla-nss = %{version}-%{release} # bug437293 %ifarch ppc64 Obsoletes: mozilla-nss-devel-64bit %endif %description devel Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled server applications. Applications built with NSS can support SSL v3, TLS v1.0, v1.1, v1.2, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. %package tools Summary: Tools for developing, debugging, and managing applications that use NSS Group: System/Management PreReq: mozilla-nss >= %{version} %description tools The NSS Security Tools allow developers to test, debug, and manage applications that use NSS. %package sysinit Summary: System NSS Initialization Group: System/Management Requires: mozilla-nss >= %{version} Requires(post): coreutils %description sysinit Default Operation System module that manages applications loading NSS globally on the system. This module loads the system defined PKCS #11 modules for NSS and chains with other NSS modules to load any system or user configured modules. %package -n libfreebl3 Summary: Freebl library for the Network Security Services Group: System/Libraries %description -n libfreebl3 Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled server applications. Applications built with NSS can support SSL v3, TLS v1.0, v1.1, v1.2, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. This package installs the freebl library from NSS. %package -n libsoftokn3 Summary: Network Security Services Softoken Module Group: System/Libraries Requires: libfreebl3 = %{version}-%{release} %description -n libsoftokn3 Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled server applications. Applications built with NSS can support SSL v3, TLS v1.0, v1.1, v1.2, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. Network Security Services Softoken Cryptographic Module %package certs Summary: CA certificates for NSS Group: Productivity/Networking/Security %description certs This package contains the integrated CA root certificates from the Mozilla project. %prep %setup -n nss-%{version} -q cd nss %patch1 -p1 %patch2 -p1 %patch4 -p1 %patch5 -p1 %if %suse_version > 1110 %patch6 -p1 %endif %patch7 -p1 %patch8 -p1 # additional CA certificates #cd security/nss/lib/ckfw/builtins #cat %{SOURCE2} >> certdata.txt #make generate %build cd nss modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" find . -name '*.[ch]' -print -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + export FREEBL_NO_DEPEND=1 export FREEBL_LOWHASH=1 export NSPR_INCLUDE_DIR=`nspr-config --includedir` export NSPR_LIB_DIR=`nspr-config --libdir` export OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export LIBDIR=%{_libdir} %ifarch x86_64 s390x ppc64 ppc64le ia64 aarch64 export USE_64=1 %endif export NSS_USE_SYSTEM_SQLITE=1 #export SQLITE_LIB_NAME=nsssqlite3 MAKE_FLAGS="BUILD_OPT=1" make nss_build_all $MAKE_FLAGS # run testsuite %if 0%{?run_testsuite} export BUILD_OPT=1 export HOST="localhost" export DOMSUF=" " export USE_IP=TRUE export IP_ADDRESS="127.0.0.1" cd tests ./all.sh if grep "FAILED" ../../../tests_results/security/localhost.1/output.log ; then echo "Testsuite FAILED" exit 1 fi %endif %install cd nss mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/nss mkdir -p $RPM_BUILD_ROOT%{_includedir}/nss3 mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT/%{_lib} mkdir -p $RPM_BUILD_ROOT%{nssdbdir} pushd ../dist/Linux* # copy headers cp -rL ../public/nss/*.h $RPM_BUILD_ROOT%{_includedir}/nss3 # copy dynamic libs cp -L lib/libnss3.so \ lib/libnssdbm3.so \ lib/libnssdbm3.chk \ lib/libnssutil3.so \ lib/libnssckbi.so \ lib/libnsssysinit.so \ lib/libsmime3.so \ lib/libsoftokn3.so \ lib/libsoftokn3.chk \ lib/libssl3.so \ $RPM_BUILD_ROOT%{_libdir} cp -L lib/libfreebl3.so \ lib/libfreebl3.chk \ $RPM_BUILD_ROOT/%{_lib} #cp -L lib/libnsssqlite3.so \ # $RPM_BUILD_ROOT%{_libdir} # copy static libs cp -L lib/libcrmf.a \ lib/libnssb.a \ lib/libnssckfw.a \ $RPM_BUILD_ROOT%{_libdir} # copy tools cp -L bin/certutil \ bin/cmsutil \ bin/crlutil \ bin/modutil \ bin/pk12util \ bin/signtool \ bin/signver \ bin/ssltap \ $RPM_BUILD_ROOT%{_bindir} # copy unsupported tools cp -L bin/atob \ bin/btoa \ bin/derdump \ bin/ocspclnt \ bin/pp \ bin/selfserv \ bin/shlibsign \ bin/strsclnt \ bin/symkeyutil \ bin/tstclnt \ bin/vfyserv \ bin/vfychain \ $RPM_BUILD_ROOT%{_libexecdir}/nss # prepare pkgconfig file mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ sed "s:%%LIBDIR%%:%{_libdir}:g s:%%VERSION%%:%{version}:g s:%%NSPR_VERSION%%:%{nspr_ver}:g" \ %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/nss.pc # prepare nss-config file popd NSS_VMAJOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | gawk '{print $3}'` NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | gawk '{print $3}'` NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | gawk '{print $3}'` cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \ -e "s,@prefix@,%{_prefix},g" \ -e "s,@exec_prefix@,%{_prefix},g" \ -e "s,@includedir@,%{_includedir}/nss3,g" \ -e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \ -e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \ -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ > $RPM_BUILD_ROOT/%{_bindir}/nss-config chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config # setup-nsssysinfo.sh install -m 744 %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/ # create empty NSS database #LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/modutil -force -dbdir "sql:$RPM_BUILD_ROOT%{nssdbdir}" -create #LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/certutil -N -d "sql:$RPM_BUILD_ROOT%{nssdbdir}" -f /dev/null 2>&1 > /dev/null #chmod 644 "$RPM_BUILD_ROOT%{nssdbdir}"/* #sed "s:%{buildroot}::g #s/^library=$/library=libnsssysinit.so/ #/^NSS/s/$Flags=internal$$,[^m]$/\1,moduleDBOnly\2/" \ # $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt > $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt.sed # mv $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt{.sed,} # copy empty NSS database install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{nssdbdir} install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{nssdbdir} install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{nssdbdir} # create shlib sigs after extracting debuginfo %define __spec_install_post \ %{?__debug_package:%{__debug_install_post}} \ %{__arch_install_post} \ %{__os_install_post} \ LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libexecdir}/nss/shlibsign -i $RPM_BUILD_ROOT%{_libdir}/libsoftokn3.so \ LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libexecdir}/nss/shlibsign -i $RPM_BUILD_ROOT%{_libdir}/libnssdbm3.so \ LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libexecdir}/nss/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \ %{nil} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post -n libfreebl3 -p /sbin/ldconfig %postun -n libfreebl3 -p /sbin/ldconfig %post -n libsoftokn3 -p /sbin/ldconfig %postun -n libsoftokn3 -p /sbin/ldconfig %post sysinit /sbin/ldconfig # make sure the current config is enabled %{_sbindir}/setup-nsssysinit.sh on %preun sysinit if [ $1 = 0 ]; then %{_sbindir}/setup-nsssysinit.sh off fi %postun sysinit -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %{_libdir}/libnss3.so %{_libdir}/libnssutil3.so %{_libdir}/libsmime3.so %{_libdir}/libssl3.so #%{_libdir}/libnsssqlite3.so %files devel %defattr(644, root, root, 755) %{_includedir}/nss3/ %{_libdir}/*.a %{_libdir}/pkgconfig/* %attr(755,root,root) %{_bindir}/nss-config %files tools %defattr(-, root, root) %{_bindir}/* %exclude %{_sbindir}/setup-nsssysinit.sh %{_libexecdir}/nss/ %exclude %{_bindir}/nss-config %files sysinit %defattr(-, root, root) %dir %{_sysconfdir}/pki %dir %{_sysconfdir}/pki/nssdb %config(noreplace) %{_sysconfdir}/pki/nssdb/* %{_libdir}/libnsssysinit.so %{_sbindir}/setup-nsssysinit.sh %files -n libfreebl3 %defattr(-, root, root) /%{_lib}/libfreebl3.so /%{_lib}/libfreebl3.chk %files -n libsoftokn3 %defattr(-, root, root) %{_libdir}/libsoftokn3.so %{_libdir}/libsoftokn3.chk %{_libdir}/libnssdbm3.so %{_libdir}/libnssdbm3.chk %files certs %defattr(-, root, root) %{_libdir}/libnssckbi.so %changelog ++++++ baselibs.conf ++++++ mozilla-nss requires "libfreebl3-<targettype>" requires "libsoftokn3-<targettype>" requires "mozilla-nss-certs-<targettype>" libsoftokn3 requires "libfreebl3-<targettype> = <version>" +/usr/lib/libsoftokn3.chk +/usr/lib/libnssdbm3.chk libfreebl3 +/lib/libfreebl3.chk mozilla-nss-sysinit mozilla-nss-certs ++++++ malloc.patch ++++++ Index: security/nss/tests/ssl/ssl.sh =================================================================== RCS file: /cvsroot/mozilla/security/nss/tests/ssl/ssl.sh,v retrieving revision 1.100 diff -u -r1.100 ssl.sh --- security/nss/tests/ssl/ssl.sh 26 Mar 2009 23:14:34 -0000 1.100 +++ nss/tests/ssl/ssl.sh 6 Jun 2009 06:21:07 -0000 @@ -974,6 +974,7 @@ ################################# main ################################# +unset MALLOC_CHECK_ ssl_init ssl_run_tests ssl_cleanup ++++++ mozilla-nss-rpmlintrc ++++++ addFilter("shlib-policy-name-error") addFilter("shlib-policy-missing-lib") addFilter("shlib-policy-missing-suffix") addFilter("shlib-unversioned-lib") addFilter("shlib-fixed-dependency") ++++++ nss-config.in ++++++ #!/bin/sh prefix=@prefix@ major_version=@MOD_MAJOR_VERSION@ minor_version=@MOD_MINOR_VERSION@ patch_version=@MOD_PATCH_VERSION@ usage() { cat <<EOF Usage: nss-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] [--includedir[=DIR]] [--libdir[=DIR]] [--version] [--libs] [--cflags] Dynamic Libraries: nss ssl smime EOF exit $1 } if test $# -eq 0; then usage 1 1>&2 fi lib_ssl=yes lib_smime=yes lib_nss=yes lib_nssutil=yes while test $# -gt 0; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac case $1 in --prefix=*) prefix=$optarg ;; --prefix) echo_prefix=yes ;; --exec-prefix=*) exec_prefix=$optarg ;; --exec-prefix) echo_exec_prefix=yes ;; --includedir=*) includedir=$optarg ;; --includedir) echo_includedir=yes ;; --libdir=*) libdir=$optarg ;; --libdir) echo_libdir=yes ;; --version) echo ${major_version}.${minor_version}.${patch_version} ;; --cflags) echo_cflags=yes ;; --libs) echo_libs=yes ;; ssl) lib_ssl=yes ;; smime) lib_smime=yes ;; nss) lib_nss=yes ;; nssutil) lib_nssutil=yes ;; *) usage 1 1>&2 ;; esac shift done # Set variables that may be dependent upon other variables if test -z "$exec_prefix"; then exec_prefix=@exec_prefix@ fi if test -z "$includedir"; then includedir=@includedir@ fi if test -z "$libdir"; then libdir=@libdir@ fi if test "$echo_prefix" = "yes"; then echo $prefix fi if test "$echo_exec_prefix" = "yes"; then echo $exec_prefix fi if test "$echo_includedir" = "yes"; then echo $includedir fi if test "$echo_libdir" = "yes"; then echo $libdir fi if test "$echo_cflags" = "yes"; then echo -I$includedir fi if test "$echo_libs" = "yes"; then libdirs="-Wl,-rpath-link,$libdir -L$libdir" if test -n "$lib_ssl"; then libdirs="$libdirs -lssl${major_version}" fi if test -n "$lib_smime"; then libdirs="$libdirs -lsmime${major_version}" fi if test -n "$lib_nss"; then libdirs="$libdirs -lnss${major_version}" fi if test -n "$lib_nssutil"; then libdirs="$libdirs -lnssutil${major_version}" fi echo $libdirs fi ++++++ nss-disable-ocsp-test.patch ++++++ diff --git a/tests/chains/scenarios/scenarios b/tests/chains/scenarios/scenarios --- a/tests/chains/scenarios/scenarios +++ b/tests/chains/scenarios/scenarios @@ -45,12 +45,11 @@ mapping.cfg mapping2.cfg aia.cfg bridgewithaia.cfg bridgewithhalfaia.cfg bridgewithpolicyextensionandmapping.cfg realcerts.cfg dsa.cfg revoc.cfg -ocsp.cfg crldp.cfg trustanchors.cfg nameconstraints.cfg ++++++ nss-no-rpath.patch ++++++ Index: security/nss/cmd/platlibs.mk =================================================================== RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v retrieving revision 1.71 diff -u -p -6 -r1.71 platlibs.mk --- security/nss/cmd/platlibs.mk 17 Jul 2012 15:22:42 -0000 1.71 +++ nss/cmd/platlibs.mk 25 Oct 2012 12:07:35 -0000 @@ -15,15 +15,15 @@ else EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps' endif endif ifeq ($(OS_ARCH), Linux) ifeq ($(USE_64), 1) -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' +#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' else -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' +#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' endif endif endif # BUILD_SUN_PKG ifdef NSS_DISABLE_DBM ++++++ nss-opt.patch ++++++ Index: security/coreconf/Linux.mk =================================================================== RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v retrieving revision 1.45.2.1 diff -u -r1.45.2.1 Linux.mk --- security/coreconf/Linux.mk 31 Jul 2010 04:23:37 -0000 1.45.2.1 +++ nss/coreconf/Linux.mk 5 Aug 2010 07:35:06 -0000 @@ -112,11 +112,7 @@ endif ifdef BUILD_OPT -ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE)) - OPTIMIZER = -Os -else - OPTIMIZER = -O2 -endif + OPTIMIZER = $(OPT_FLAGS) ifdef MOZ_DEBUG_SYMBOLS ifdef MOZ_DEBUG_FLAGS OPTIMIZER += $(MOZ_DEBUG_FLAGS) ++++++ nss-sqlitename.patch ++++++ Index: security/nss/lib/sqlite/manifest.mn =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v retrieving revision 1.5 diff -u -r1.5 manifest.mn --- security/nss/lib/sqlite/manifest.mn 25 Apr 2012 14:50:11 -0000 1.5 +++ nss/lib/sqlite/manifest.mn 28 Jan 2013 20:48:22 -0000 @@ -6,9 +6,10 @@ MODULE = nss -LIBRARY_NAME = sqlite +LIBRARY_NAME = nsssqlite LIBRARY_VERSION = 3 MAPFILE = $(OBJDIR)/sqlite.def +MAPFILE_SOURCE = sqlite.def DEFINES += -DSQLITE_THREADSAFE=1 EXPORTS = \ ++++++ nss.pc.in ++++++ prefix=/usr exec_prefix=${prefix} libdir=%LIBDIR% includedir=${prefix}/include/nss3 Name: NSS Description: Network Security Services Version: %VERSION% Requires: nspr >= %NSPR_VERSION% Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 Cflags: -I${includedir} ++++++ pkcs11.txt ++++++ library=libnsssysinit.so name=NSS Internal PKCS #11 Module parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' NSS=Flags=internal,moduleDBOnly,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) ++++++ renegotiate-transitional.patch ++++++ diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c index e6b2387..87fbe1d 100644 --- a/lib/ssl/sslsock.c +++ b/lib/ssl/sslsock.c @@ -74,7 +74,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* noLocks */ PR_FALSE, /* enableSessionTickets */ PR_FALSE, /* enableDeflate */ - 2, /* enableRenegotiation (default: requires extension) */ + 3, /* enableRenegotiation (default: requires extension) */ PR_FALSE, /* requireSafeNegotiation */ PR_FALSE, /* enableFalseStart */ PR_TRUE, /* cbcRandomIV */ ++++++ setup-nsssysinit.sh ++++++ #!/bin/sh # # Turns on or off the nss-sysinit module db by editing the # global PKCS #11 congiguration file. # # This script can be invoked by the user as super user. # It is invoked at nss-sysinit post install time with argument on # and at nss-sysinit pre uninstall with argument off. # usage() { cat <<EOF Usage: setup-nsssysinit [on|off] on - turns on nsssysinit off - turns off nsssysinit EOF exit $1 } # validate if test $# -eq 0; then usage 1 1>&2 fi # the system-wide configuration file p11conf="/etc/pki/nssdb/pkcs11.txt" # must exist, otherwise report it and exit with failure if [ ! -f $p11conf ]; then echo "Could not find ${p11conf}" exit 1 fi on="1" case "$1" in on | ON ) cat ${p11conf} | \ sed -e 's/^library=$/library=libnsssysinit.so/' \ -e '/^NSS/s/$Flags=internal$$,[^m]$/\1,moduleDBOnly\2/' > \ ${p11conf}.on mv ${p11conf}.on ${p11conf} ;; off | OFF ) if [ ! `grep "^library=libnsssysinit" ${p11conf}` ]; then exit 0 fi cat ${p11conf} | \ sed -e 's/^library=libnsssysinit.so/library=/' \ -e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \ ${p11conf}.off mv ${p11conf}.off ${p11conf} ;; * ) usage 1 1>&2 ;; esac ++++++ system-nspr.patch ++++++ diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -39,17 +39,17 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -nss_build_all: build_nspr all +nss_build_all: all nss_clean_all: clobber_nspr clobber NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure # # Translate coreconf build options to NSPR configure options. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Nagios-Plugin for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package perl-Nagios-Plugin for openSUSE:Factory checked in at 2014-09-26 10:52:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Nagios-Plugin (Old) and /work/SRC/openSUSE:Factory/.perl-Nagios-Plugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Nagios-Plugin" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Nagios-Plugin/perl-Nagios-Plugin.changes 2013-12-04 13:12:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Nagios-Plugin.new/perl-Nagios-Plugin.changes 2014-09-26 11:21:56.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 23 19:32:49 UTC 2014 - lars(a)linux-schulserver.de + +- fix Url + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Nagios-Plugin.spec ++++++ --- /var/tmp/diff_new_pack.rUn4RZ/_old 2014-09-26 11:21:56.000000000 +0200 +++ /var/tmp/diff_new_pack.rUn4RZ/_new 2014-09-26 11:21:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Nagios-Plugin # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -24,7 +24,7 @@ Summary: A family of perl modules to streamline writing Nagios plugins License: Artistic-1.0 or GPL-2.0+ Group: Development/Languages/Perl -Url: http://www.perl.org/ +Url: http://search.cpan.org/perldoc?Nagios%3A%3APlugin Source: %cpan_name-%{version}.tar.gz BuildRequires: perl BuildRequires: perl-macros -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Rivet for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2014-09-26 10:52:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Rivet (Old) and /work/SRC/openSUSE:Factory/.Rivet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Rivet" Changes: -------- --- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2014-06-24 22:47:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Rivet.new/Rivet.changes 2014-09-26 11:21:53.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Sep 25 18:18:21 UTC 2014 - sfalken(a)opensuse.org + +- Added 0001-fix_YODA_Histo1D_includes.patch + fixed buildfailure due to YODA/Histo1D changing function names + Additionally fixed buildfailure from MAXINT being defined but not used + See https://www.hepforge.org/lists-archive/rivet/2014-September/005167.html + +------------------------------------------------------------------- New: ---- 0001-fix_YODA_Histo1D_includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Rivet.spec ++++++ --- /var/tmp/diff_new_pack.UKAISa/_old 2014-09-26 11:21:54.000000000 +0200 +++ /var/tmp/diff_new_pack.UKAISa/_new 2014-09-26 11:21:54.000000000 +0200 @@ -28,12 +28,15 @@ Source: http://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM Rivet-compatibility-with-old-boost.patch badshah400(a)gmail.com -- Fix foreach compatibility with boost < 1.50 and make Rivet build with openSUSE 12.3 again Patch0: Rivet-compatibility-with-old-boost.patch +# PATCH-FIX-UPSTREAM 0001-fix_YODA_Histo1D_includes.patch sfalken(a)opensuse.org -- Fix buildfailure in MathHeader.hh by updating for YODA changing from mean and stdDev to xMean and xStdDev +Patch1: 0001-fix_YODA_Histo1D_includes.patch BuildRequires: HepMC-devel BuildRequires: YODA-devel >= 1.0.6 BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: fastjet-devel BuildRequires: fastjet-plugin-siscone-devel +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python-devel @@ -106,6 +109,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # REMOVE EXISTING rivet.pc FILE, ALLOW make TO GENERATE rivet.pc FROM rivet.pc.in rm -f rivet.pc ++++++ 0001-fix_YODA_Histo1D_includes.patch ++++++ From: Shawn W Dunn <sfalken(a)opensuse.org> Date: 2014-09-25 11:12:02.118348640 -0700 Subject: Fix buildfailure, due to changes in YODA/Histo1D.h References: https://www.hepforge.org/lists-archive/rivet/2014-September/005167.html Upstream: submitted Index: Rivet-2.1.2/include/Rivet/Math/MathHeader.hh =================================================================== --- Rivet-2.1.2.orig/include/Rivet/Math/MathHeader.hh +++ Rivet-2.1.2/include/Rivet/Math/MathHeader.hh @@ -42,7 +42,8 @@ namespace Rivet { using std::isinf; const double MAXDOUBLE = std::numeric_limits<double>::max(); - const double MAXINT = std::numeric_limits<int>::max(); + /// MAXINT is being defined but not used, causing buildfailure + /// const double MAXINT = std::numeric_limits<int>::max(); /// A pre-defined value of \f$ \pi \f$. const double PI = M_PI; Index: Rivet-2.1.2/src/Analyses/CMS_2013_I1261026.cc =================================================================== --- Rivet-2.1.2.orig/src/Analyses/CMS_2013_I1261026.cc +++ Rivet-2.1.2/src/Analyses/CMS_2013_I1261026.cc @@ -102,20 +102,20 @@ namespace Rivet { void finalize() { for (size_t i = 0; i < 5; ++i) { // All trk mean pT vs Nch - _h_AllTrkMeanPt->fill(_multBinCent[i], _th_AllTrkSpectrum[i].mean(), getMeanError(_th_AllTrkSpectrum[i])); + _h_AllTrkMeanPt->fill(_multBinCent[i], _th_AllTrkSpectrum[i].xMean(), getMeanError(_th_AllTrkSpectrum[i])); // Soft trk mean pT vs Nch - _h_SoftTrkMeanPt->fill(_multBinCent[i], _th_SoftTrkSpectrum[i].mean(), getMeanError(_th_SoftTrkSpectrum[i])); + _h_SoftTrkMeanPt->fill(_multBinCent[i], _th_SoftTrkSpectrum[i].xMean(), getMeanError(_th_SoftTrkSpectrum[i])); // Intrajet trk mean pT vs Nch - _h_IntrajetTrkMeanPt->fill(_multBinCent[i], _th_JetTrkSpectrum[i].mean(), getMeanError(_th_JetTrkSpectrum[i])); + _h_IntrajetTrkMeanPt->fill(_multBinCent[i], _th_JetTrkSpectrum[i].xMean(), getMeanError(_th_JetTrkSpectrum[i])); // Intrajet leader trk mean pT vs Nch - _h_IntrajetLeaderTrkMeanPt->fill(_multBinCent[i], _th_JetLTrkSpectrum[i].mean(), getMeanError(_th_JetLTrkSpectrum[i])); + _h_IntrajetLeaderTrkMeanPt->fill(_multBinCent[i], _th_JetLTrkSpectrum[i].xMean(), getMeanError(_th_JetLTrkSpectrum[i])); // Jet mean pT vs Nch - const double sem = (_h_JetSpectrum[i]->stdDev())/(sqrt(_h_JetSpectrum[i]->sumW())) / _h_JetSpectrum[i]->mean(); - _h_MeanJetPt->fill(_multBinCent[i], _h_JetSpectrum[i]->mean(), sem); + const double sem = (_h_JetSpectrum[i]->xStdDev())/(sqrt(_h_JetSpectrum[i]->sumW())) / _h_JetSpectrum[i]->xMean(); + _h_MeanJetPt->fill(_multBinCent[i], _h_JetSpectrum[i]->xMean(), sem); // Jet rates _avJetRate5[i] = _jetCounter5GeV[i] / _passedEv[i]; @@ -135,8 +135,8 @@ namespace Rivet { double getMeanError(const Histo1D& hist) { - double SEM = hist.stdDev() / sqrt(hist.numEntries()); // Standard error of the mean - return SEM / hist.mean(); // relative SEM + double SEM = hist.xStdDev() / sqrt(hist.numEntries()); // Standard error of the mean + return SEM / hist.xMean(); // relative SEM } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnuradio for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package gnuradio for openSUSE:Factory checked in at 2014-09-26 10:52:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuradio (Old) and /work/SRC/openSUSE:Factory/.gnuradio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnuradio" Changes: -------- --- /work/SRC/openSUSE:Factory/gnuradio/gnuradio.changes 2014-09-12 10:03:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnuradio.new/gnuradio.changes 2014-09-26 11:21:50.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 19 10:26:19 UTC 2014 - wk(a)ire.pw.edu.pl + +- update to version 3.7.5 +- patch gnuradio-implicit-fortify-decl.patch removed (applied upstream) + +------------------------------------------------------------------- Old: ---- gnuradio-3.7.4.tar.gz gnuradio-implicit-fortify-decl.patch New: ---- gnuradio-3.7.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuradio.spec ++++++ --- /var/tmp/diff_new_pack.fVT5u7/_old 2014-09-26 11:21:51.000000000 +0200 +++ /var/tmp/diff_new_pack.fVT5u7/_new 2014-09-26 11:21:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnuradio -Version: 3.7.4 +Version: 3.7.5 Release: 0 %define soname 0 Summary: GNU software radio @@ -27,8 +27,6 @@ Source: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz Source1: %{name}-rpmlintrc Source2: http://www.nathanwest.us/grc_to_37.sh -# PATCH-FIX-UPSTREAM gnuradio-implicit-fortify-decl.patch -Patch1: gnuradio-implicit-fortify-decl.patch BuildRequires: alsa-devel BuildRequires: boost-devel BuildRequires: cmake @@ -134,7 +132,6 @@ %prep %setup -q -%patch1 -p1 # remove buildtime from documentation sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in ++++++ gnuradio-3.7.4.tar.gz -> gnuradio-3.7.5.tar.gz ++++++ ++++ 105239 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

commit almanah for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package almanah for openSUSE:Factory checked in at 2014-09-26 10:52:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/almanah (Old) and /work/SRC/openSUSE:Factory/.almanah.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "almanah" Changes: -------- --- /work/SRC/openSUSE:Factory/almanah/almanah.changes 2013-12-28 09:03:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.almanah.new/almanah.changes 2014-09-26 11:21:49.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 25 11:30:46 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.11.1: + + Improved AppData support for Software App. + + Updated translations. + +------------------------------------------------------------------- Old: ---- almanah-0.11.0.tar.xz New: ---- almanah-0.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ almanah.spec ++++++ --- /var/tmp/diff_new_pack.V7Vz9R/_old 2014-09-26 11:21:50.000000000 +0200 +++ /var/tmp/diff_new_pack.V7Vz9R/_new 2014-09-26 11:21:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package almanah # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,7 +17,7 @@ Name: almanah -Version: 0.11.0 +Version: 0.11.1 Release: 0 # FIXME: Remove -UE_CAL_DISABLE_DEPRECATED from CFLAGS (bgo#698259) Summary: GTK+ application to allow you to keep a diary of your life ++++++ almanah-0.11.0.tar.xz -> almanah-0.11.1.tar.xz ++++++ ++++ 6444 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

commit haproxy for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2014-09-26 10:52:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haproxy" Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2014-09-06 12:18:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2014-09-26 11:21:48.000000000 +0200 @@ -1,0 +2,37 @@ +Thu Sep 25 16:10:08 UTC 2014 - kgronlund(a)suse.com + +- Backported fixes (bnc#898498): + - DOC: clearly state that the "show sess" output format is not fixed + - MINOR: stats: fix minor typo fix in stats_dump_errors_to_buffer() + - MEDIUM: Improve signal handling in systemd wrapper. + - MINOR: Also accept SIGHUP/SIGTERM in systemd-wrapper + - DOC: indicate in the doc that track-sc* can wait if data are missing + - MEDIUM: http: enable header manipulation for 101 responses + - BUG/MEDIUM: config: propagate frontend to backend process binding again. + - MEDIUM: config: properly propagate process binding between proxies + - MEDIUM: config: make the frontends automatically bind to the listeners' processes + - MEDIUM: config: compute the exact bind-process before listener's maxaccept + - MEDIUM: config: only warn if stats are attached to multi-process bind directives + - MEDIUM: config: report it when tcp-request rules are misplaced + - MINOR: config: detect the case where a tcp-request content rule has no inspect-delay + - MEDIUM: systemd-wrapper: support multiple executable versions and names + - BUG/MEDIUM: remove debugging code from systemd-wrapper + +- Added patches: + - 0001-DOC-clearly-state-that-the-show-sess-output-format-i.patch + - 0002-MINOR-stats-fix-minor-typo-fix-in-stats_dump_errors_.patch + - 0003-MEDIUM-Improve-signal-handling-in-systemd-wrapper.patch + - 0004-MINOR-Also-accept-SIGHUP-SIGTERM-in-systemd-wrapper.patch + - 0005-DOC-indicate-in-the-doc-that-track-sc-can-wait-if-da.patch + - 0006-MEDIUM-http-enable-header-manipulation-for-101-respo.patch + - 0007-BUG-MEDIUM-config-propagate-frontend-to-backend-proc.patch + - 0008-MEDIUM-config-properly-propagate-process-binding-bet.patch + - 0009-MEDIUM-config-make-the-frontends-automatically-bind-.patch + - 0010-MEDIUM-config-compute-the-exact-bind-process-before-.patch + - 0011-MEDIUM-config-only-warn-if-stats-are-attached-to-mul.patch + - 0012-MEDIUM-config-report-it-when-tcp-request-rules-are-m.patch + - 0013-MINOR-config-detect-the-case-where-a-tcp-request-con.patch + - 0014-MEDIUM-systemd-wrapper-support-multiple-executable-v.patch + - 0015-BUG-MEDIUM-remove-debugging-code-from-systemd-wrappe.patch + +------------------------------------------------------------------- @@ -4 +41 @@ -- update to 1.5.4 +- update to 1.5.4 (bnc#895849 CVE-2014-6269) New: ---- 0001-DOC-clearly-state-that-the-show-sess-output-format-i.patch 0002-MINOR-stats-fix-minor-typo-fix-in-stats_dump_errors_.patch 0003-MEDIUM-Improve-signal-handling-in-systemd-wrapper.patch 0004-MINOR-Also-accept-SIGHUP-SIGTERM-in-systemd-wrapper.patch 0005-DOC-indicate-in-the-doc-that-track-sc-can-wait-if-da.patch 0006-MEDIUM-http-enable-header-manipulation-for-101-respo.patch 0007-BUG-MEDIUM-config-propagate-frontend-to-backend-proc.patch 0008-MEDIUM-config-properly-propagate-process-binding-bet.patch 0009-MEDIUM-config-make-the-frontends-automatically-bind-.patch 0010-MEDIUM-config-compute-the-exact-bind-process-before-.patch 0011-MEDIUM-config-only-warn-if-stats-are-attached-to-mul.patch 0012-MEDIUM-config-report-it-when-tcp-request-rules-are-m.patch 0013-MINOR-config-detect-the-case-where-a-tcp-request-con.patch 0014-MEDIUM-systemd-wrapper-support-multiple-executable-v.patch 0015-BUG-MEDIUM-remove-debugging-code-from-systemd-wrappe.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.ZaMkgj/_old 2014-09-26 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.ZaMkgj/_new 2014-09-26 11:21:49.000000000 +0200 @@ -61,6 +61,36 @@ Patch2: haproxy-makefile_lib.patch Patch3: sec-options.patch Patch4: haproxy-1.5_check_config_before_start.patch +# PATCH-FIX-UPSTREAM: DOC: clearly state that the "show sess" output format is not fixed +Patch5: 0001-DOC-clearly-state-that-the-show-sess-output-format-i.patch +# PATCH-FIX-UPSTREAM: MINOR: stats: fix minor typo fix in stats_dump_errors_to_buffer() +Patch6: 0002-MINOR-stats-fix-minor-typo-fix-in-stats_dump_errors_.patch +# PATCH-FIX-UPSTREAM: MEDIUM: Improve signal handling in systemd wrapper. +Patch7: 0003-MEDIUM-Improve-signal-handling-in-systemd-wrapper.patch +# PATCH-FIX-UPSTREAM: MINOR: Also accept SIGHUP/SIGTERM in systemd-wrapper +Patch8: 0004-MINOR-Also-accept-SIGHUP-SIGTERM-in-systemd-wrapper.patch +# PATCH-FIX-UPSTREAM: DOC: indicate in the doc that track-sc* can wait if data are missing +Patch9: 0005-DOC-indicate-in-the-doc-that-track-sc-can-wait-if-da.patch +# PATCH-FIX-UPSTREAM: MEDIUM: http: enable header manipulation for 101 responses +Patch10: 0006-MEDIUM-http-enable-header-manipulation-for-101-respo.patch +# PATCH-FIX-UPSTREAM: BUG/MEDIUM: config: propagate frontend to backend process binding again. +Patch11: 0007-BUG-MEDIUM-config-propagate-frontend-to-backend-proc.patch +# PATCH-FIX-UPSTREAM: MEDIUM: config: properly propagate process binding between proxies +Patch12: 0008-MEDIUM-config-properly-propagate-process-binding-bet.patch +# PATCH-FIX-UPSTREAM: MEDIUM: config: make the frontends automatically bind to the listeners' processes +Patch13: 0009-MEDIUM-config-make-the-frontends-automatically-bind-.patch +# PATCH-FIX-UPSTREAM: MEDIUM: config: compute the exact bind-process before listener's maxaccept +Patch14: 0010-MEDIUM-config-compute-the-exact-bind-process-before-.patch +# PATCH-FIX-UPSTREAM: MEDIUM: config: only warn if stats are attached to multi-process bind directives +Patch15: 0011-MEDIUM-config-only-warn-if-stats-are-attached-to-mul.patch +# PATCH-FIX-UPSTREAM: MEDIUM: config: report it when tcp-request rules are misplaced +Patch16: 0012-MEDIUM-config-report-it-when-tcp-request-rules-are-m.patch +# PATCH-FIX-UPSTREAM: MINOR: config: detect the case where a tcp-request content rule has no inspect-delay +Patch17: 0013-MINOR-config-detect-the-case-where-a-tcp-request-con.patch +# PATCH-FIX-UPSTREAM: MEDIUM: systemd-wrapper: support multiple executable versions and names +Patch18: 0014-MEDIUM-systemd-wrapper-support-multiple-executable-v.patch +# PATCH-FIX-UPSTREAM: BUG/MEDIUM: remove debugging code from systemd-wrapper +Patch19: 0015-BUG-MEDIUM-remove-debugging-code-from-systemd-wrappe.patch Source99: haproxy-rpmlintrc # Summary: The Reliable, High Performance TCP/HTTP Load Balancer @@ -94,6 +124,21 @@ %patch2 %patch3 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 %build %{__make} \ ++++++ 0001-DOC-clearly-state-that-the-show-sess-output-format-i.patch ++++++ >From e99d44d4bc3423b721c7f654fd1778b9822a94e3 Mon Sep 17 00:00:00 2001 From: Olivier <webmaster(a)ajeux.com> Date: Fri, 5 Sep 2014 18:49:10 +0200 Subject: [PATCH 01/15] DOC: clearly state that the "show sess" output format is not fixed It requires to look at the code (src/dumpstats.c) since the format may change at any moment. (cherry picked from commit ce31e6e3baebe75a2e6f6b5c66553db8d76dff0c) --- doc/configuration.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index 19df5ae..1ecf15a 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -13734,9 +13734,11 @@ show sess <id> of "show sess" (it corresponds to the session pointer). Those information are useless to most users but may be used by haproxy developers to troubleshoot a complex bug. The output format is intentionally not documented so that it can - freely evolve depending on demands. The special id "all" dumps the states of - all sessions, which can be avoided as much as possible as it is highly CPU - intensive and can take a lot of time. + freely evolve depending on demands. You may find a description of all fields + returned in src/dumpstats.c + + The special id "all" dumps the states of all sessions, which must be avoided + as much as possible as it is highly CPU intensive and can take a lot of time. show stat [<iid> <type> <sid>] Dump statistics in the CSV format. By passing <id>, <type> and <sid>, it is -- 1.8.4.5 ++++++ 0002-MINOR-stats-fix-minor-typo-fix-in-stats_dump_errors_.patch ++++++ >From 815d7d5c348575181874429b93b0ebdb0cf873c2 Mon Sep 17 00:00:00 2001 From: Olivier Doucet <webmaster(a)ajeux.com> Date: Mon, 8 Sep 2014 11:23:00 +0200 Subject: [PATCH 02/15] MINOR: stats: fix minor typo fix in stats_dump_errors_to_buffer() Remove the space before the colon to match the format used in the frontend. (cherry picked from commit 08afdcb47bc39c071787f8fc2066776e1c5e8607) --- src/dumpstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dumpstats.c b/src/dumpstats.c index 5365042..09bc7f6 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -6045,7 +6045,7 @@ static int stats_dump_errors_to_buffer(struct stream_interface *si) break; case 1: chunk_appendf(&trash, - " backend %s (#%d) : invalid response\n" + " backend %s (#%d): invalid response\n" " frontend %s (#%d)", appctx->ctx.errors.px->id, appctx->ctx.errors.px->uuid, es->oe->id, es->oe->uuid); -- 1.8.4.5 ++++++ 0003-MEDIUM-Improve-signal-handling-in-systemd-wrapper.patch ++++++ >From 62c8565cd5bbda6ac0dd818fa26922eeaef1605c Mon Sep 17 00:00:00 2001 From: Conrad Hoffmann <conrad(a)soundcloud.com> Date: Mon, 28 Jul 2014 23:52:20 +0200 Subject: [PATCH 03/15] MEDIUM: Improve signal handling in systemd wrapper. Move all code out of the signal handlers, since this is potentially dangerous. To make sure the signal handlers behave as expected, use sigaction() instead of signal(). That also obsoletes messing with the signal mask after restart. Signed-off-by: Conrad Hoffmann <conrad(a)soundcloud.com> (cherry picked from commit 5b5ea9c93384da49eea0f67ebed0966d4167b17a) --- src/haproxy-systemd-wrapper.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/haproxy-systemd-wrapper.c b/src/haproxy-systemd-wrapper.c index 529b213..90a94ce 100644 --- a/src/haproxy-systemd-wrapper.c +++ b/src/haproxy-systemd-wrapper.c @@ -22,6 +22,8 @@ #define SD_DEBUG "<7>" #define SD_NOTICE "<5>" +static volatile sig_atomic_t caught_signal; + static char *pid_file = "/run/haproxy.pid"; static int wrapper_argc; static char **wrapper_argv; @@ -103,7 +105,12 @@ static int read_pids(char ***pid_strv) return read; } -static void sigusr2_handler(int signum __attribute__((unused))) +static void signal_handler(int signum) +{ + caught_signal = signum; +} + +static void do_restart(void) { setenv(REEXEC_FLAG, "1", 1); fprintf(stderr, SD_NOTICE "haproxy-systemd-wrapper: re-executing\n"); @@ -111,7 +118,7 @@ static void sigusr2_handler(int signum __attribute__((unused))) execv(wrapper_argv[0], wrapper_argv); } -static void sigint_handler(int signum __attribute__((unused))) +static void do_shutdown(void) { int i, pid; char **pid_strv = NULL; @@ -147,25 +154,21 @@ int main(int argc, char **argv) --argc; ++argv; init(argc, argv); - signal(SIGINT, &sigint_handler); - signal(SIGUSR2, &sigusr2_handler); + struct sigaction sa; + memset(&sa, 0, sizeof(struct sigaction)); + sa.sa_handler = &signal_handler; + sigaction(SIGUSR2, &sa, NULL); + sigaction(SIGINT, &sa, NULL); if (getenv(REEXEC_FLAG) != NULL) { /* We are being re-executed: restart HAProxy gracefully */ int i; char **pid_strv = NULL; int nb_pid = read_pids(&pid_strv); - sigset_t sigs; unsetenv(REEXEC_FLAG); spawn_haproxy(pid_strv, nb_pid); - /* Unblock SIGUSR2 which was blocked by the signal handler - * before re-exec */ - sigprocmask(SIG_BLOCK, NULL, &sigs); - sigdelset(&sigs, SIGUSR2); - sigprocmask(SIG_SETMASK, &sigs, NULL); - for (i = 0; i < nb_pid; ++i) free(pid_strv[i]); free(pid_strv); @@ -176,8 +179,16 @@ int main(int argc, char **argv) } status = -1; - while (-1 != wait(&status) || errno == EINTR) - ; + while (-1 != wait(&status) || errno == EINTR) { + if (caught_signal == SIGUSR2) { + caught_signal = 0; + do_restart(); + } + else if (caught_signal == SIGINT) { + caught_signal = 0; + do_shutdown(); + } + } fprintf(stderr, SD_NOTICE "haproxy-systemd-wrapper: exit, haproxy RC=%d\n", status); -- 1.8.4.5 ++++++ 0004-MINOR-Also-accept-SIGHUP-SIGTERM-in-systemd-wrapper.patch ++++++ >From 6bb7bf7949dd019403b65f400c4b3d0d8589327b Mon Sep 17 00:00:00 2001 From: Matt Robenolt <matt(a)ydekproductions.com> Date: Thu, 11 Sep 2014 05:19:30 +0000 Subject: [PATCH 04/15] MINOR: Also accept SIGHUP/SIGTERM in systemd-wrapper My proposal is to let haproxy-systemd-wrapper also accept normal SIGHUP/SIGTERM signals to play nicely with other process managers besides just systemd. In my use case, this will be for using with runit which has to ability to change the signal used for a "reload" or "stop" command. It also might be worth renaming this bin to just haproxy-wrapper or something of that sort to separate itself away from systemd. But that's a different discussion. :) (cherry picked from commit c54bdd2a118161b4dc36963b4201edfa7341dadb) --- src/haproxy-systemd-wrapper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/haproxy-systemd-wrapper.c b/src/haproxy-systemd-wrapper.c index 90a94ce..cc8baa8 100644 --- a/src/haproxy-systemd-wrapper.c +++ b/src/haproxy-systemd-wrapper.c @@ -158,7 +158,9 @@ int main(int argc, char **argv) memset(&sa, 0, sizeof(struct sigaction)); sa.sa_handler = &signal_handler; sigaction(SIGUSR2, &sa, NULL); + sigaction(SIGHUP, &sa, NULL); sigaction(SIGINT, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); if (getenv(REEXEC_FLAG) != NULL) { /* We are being re-executed: restart HAProxy gracefully */ @@ -180,11 +182,11 @@ int main(int argc, char **argv) status = -1; while (-1 != wait(&status) || errno == EINTR) { - if (caught_signal == SIGUSR2) { + if (caught_signal == SIGUSR2 || caught_signal == SIGHUP) { caught_signal = 0; do_restart(); } - else if (caught_signal == SIGINT) { + else if (caught_signal == SIGINT || caught_signal == SIGTERM) { caught_signal = 0; do_shutdown(); } -- 1.8.4.5 ++++++ 0005-DOC-indicate-in-the-doc-that-track-sc-can-wait-if-da.patch ++++++ >From 531485c08ffb15b939a28ecf47090e4c93341d1b Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 15:48:15 +0200 Subject: [PATCH 05/15] DOC: indicate in the doc that track-sc* can wait if data are missing Since commit 1b71eb5 ("BUG/MEDIUM: counters: fix track-sc* to wait on unstable contents"), we don't need the "if HTTP" anymore. But the doc was not updated to reflect this. Since this change was backported to 1.5, this doc update should be backported as well. (cherry picked from commit 4d54c7ca0286588de5060acce9aff8aa9645bb98) --- doc/configuration.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index 1ecf15a..3c75c92 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -7470,9 +7470,9 @@ tcp-request content <action> [{if | unless} <condition>] contents will always be immediately present when the rule is evaluated first. Tracking layer7 information is also possible provided that the information - are present when the rule is processed. The current solution for making the - rule engine wait for such information is to set an inspect delay and to - condition its execution with an ACL relying on such information. + are present when the rule is processed. The rule processing engine is able to + wait until the inspect delay expires when the data to be tracked is not yet + available. Example: # Accept HTTP requests containing a Host header saying "example.com" @@ -7497,12 +7497,12 @@ tcp-request content <action> [{if | unless} <condition>] Example: # Track the last IP from X-Forwarded-For tcp-request inspect-delay 10s - tcp-request content track-sc0 hdr(x-forwarded-for,-1) if HTTP + tcp-request content track-sc0 hdr(x-forwarded-for,-1) Example: # track request counts per "base" (concatenation of Host+URL) tcp-request inspect-delay 10s - tcp-request content track-sc0 base table req-rate if HTTP + tcp-request content track-sc0 base table req-rate Example: track per-frontend and per-backend counters, block abusers at the frontend when the backend detects abuse. -- 1.8.4.5 ++++++ 0006-MEDIUM-http-enable-header-manipulation-for-101-respo.patch ++++++ >From 0cb4b899d370b9d04b3457a1d75dbd658c1a1646 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 10:40:38 +0200 Subject: [PATCH 06/15] MEDIUM: http: enable header manipulation for 101 responses Ryan Brock reported that server stickiness did not work for WebSocket because the cookies and headers are not modified on 1xx responses. He found that his browser correctly presents the cookies learned on 101 responses, which was not specifically defined in the WebSocket spec, nor in the cookie spec. 101 is a very special case. Being part of 1xx, it's an interim response. But within 1xx, it's special because it's the last HTTP/1 response that transits on the wire, which is different from 100 or 102 which may appear multiple times. So in that sense, we can consider it as a final response regarding HTTP/1, and it makes sense to allow header processing there. Note that we still ensure not to mangle the Connection header, which is critical for HTTP upgrade to continue to work smoothly with agents that are a bit picky about what tokens are found there. The rspadd rules are now processed for 101 responses as well, but the cache-control checks are not performed (since no body is delivered). Ryan confirmed that this patch works for him. It would make sense to backport it to 1.5 given that it improves end user experience on WebSocket servers. (cherry picked from commit ce730de86719d0b5079dd8b0843559e4ff0a1ecc) --- src/proto_http.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/proto_http.c b/src/proto_http.c index 4d27b2c..7e35c8b 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -6249,7 +6249,7 @@ int http_process_res_common(struct session *s, struct channel *rep, int an_bit, /* add response headers from the rule sets in the same order */ list_for_each_entry(wl, &rule_set->rsp_add, list) { - if (txn->status < 200) + if (txn->status < 200 && txn->status != 101) break; if (wl->cond) { int ret = acl_exec_cond(wl->cond, px, s, txn, SMP_OPT_DIR_RES|SMP_OPT_FINAL); @@ -6270,7 +6270,7 @@ int http_process_res_common(struct session *s, struct channel *rep, int an_bit, } /* OK that's all we can do for 1xx responses */ - if (unlikely(txn->status < 200)) + if (unlikely(txn->status < 200 && txn->status != 101)) goto skip_header_mangling; /* @@ -6283,7 +6283,7 @@ int http_process_res_common(struct session *s, struct channel *rep, int an_bit, /* * Check for cache-control or pragma headers if required. */ - if ((s->be->options & PR_O_CHK_CACHE) || (s->be->ck_opts & PR_CK_NOC)) + if (((s->be->options & PR_O_CHK_CACHE) || (s->be->ck_opts & PR_CK_NOC)) && txn->status != 101) check_response_for_cacheability(s, rep); /* @@ -6399,9 +6399,11 @@ int http_process_res_common(struct session *s, struct channel *rep, int an_bit, * Adjust "Connection: close" or "Connection: keep-alive" if needed. * If an "Upgrade" token is found, the header is left untouched in order * not to have to deal with some client bugs : some of them fail an upgrade - * if anything but "Upgrade" is present in the Connection header. + * if anything but "Upgrade" is present in the Connection header. We don't + * want to touch any 101 response either since it's switching to another + * protocol. */ - if (!(txn->flags & TX_HDR_CONN_UPG) && + if ((txn->status != 101) && !(txn->flags & TX_HDR_CONN_UPG) && (((txn->flags & TX_CON_WANT_MSK) != TX_CON_WANT_TUN) || ((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL || (s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL))) { -- 1.8.4.5 ++++++ 0007-BUG-MEDIUM-config-propagate-frontend-to-backend-proc.patch ++++++ >From b53934eec71ab34eb3762a89cec326360a5b0bc5 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 11:31:31 +0200 Subject: [PATCH 07/15] BUG/MEDIUM: config: propagate frontend to backend process binding again. This basically reverts 3507d5d ("MEDIUM: proxy: only adjust the backend's bind-process when already set"). It was needed during the transition to the new process binding method but is causing trouble now because frontend to backend binding is not properly propagated. This fix should be backported to 1.5. (cherry picked from commit 8a3478ed31a16904f45178c153f4649faf6de675) --- src/cfgparse.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index 943eba0..5288600 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -6165,9 +6165,8 @@ int check_config_validity() /* we force the backend to be present on at least all of * the frontend's processes. */ - if (target->bind_proc) - target->bind_proc = curproxy->bind_proc ? - (target->bind_proc | curproxy->bind_proc) : 0; + target->bind_proc = curproxy->bind_proc ? + (target->bind_proc | curproxy->bind_proc) : 0; /* Emit a warning if this proxy also has some servers */ if (curproxy->srv) { @@ -6203,9 +6202,8 @@ int check_config_validity() /* we force the backend to be present on at least all of * the frontend's processes. */ - if (target->bind_proc) - target->bind_proc = curproxy->bind_proc ? - (target->bind_proc | curproxy->bind_proc) : 0; + target->bind_proc = curproxy->bind_proc ? + (target->bind_proc | curproxy->bind_proc) : 0; } } } @@ -6257,9 +6255,8 @@ int check_config_validity() /* we force the backend to be present on at least all of * the frontend's processes. */ - if (target->bind_proc) - target->bind_proc = curproxy->bind_proc ? - (target->bind_proc | curproxy->bind_proc) : 0; + target->bind_proc = curproxy->bind_proc ? + (target->bind_proc | curproxy->bind_proc) : 0; } } -- 1.8.4.5 ++++++ 0008-MEDIUM-config-properly-propagate-process-binding-bet.patch ++++++ >From 5436afc9488531a5e2adff3a1a766af375e0922c Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 12:17:36 +0200 Subject: [PATCH 08/15] MEDIUM: config: properly propagate process binding between proxies We now recursively propagate the bind-process values between frontends and backends instead of doing it during name resolving. This ensures that we're able to properly propagate all the bind-process directives even across "listen" instances, which are not perfectly covered at the moment, depending on the declaration order. (cherry picked from commit 64ab6077b768ee02b04a36b30ee195639a2fabc1) --- src/cfgparse.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 16 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index 5288600..b9853ef 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -5932,6 +5932,64 @@ int readcfgfile(const char *file) return err_code; } +/* This function propagates processes from frontend <from> to backend <to> so + * that it is always guaranteed that a backend pointed to by a frontend is + * bound to all of its processes. After that, if the target is a "listen" + * instance, the function recursively descends the target's own targets along + * default_backend, use_backend rules, and reqsetbe rules. Since the bits are + * checked first to ensure that <to> is already bound to all processes of + * <from>, there is no risk of looping and we ensure to follow the shortest + * path to the destination. + * + * It is possible to set <to> to NULL for the first call so that the function + * takes care of visiting the initial frontend in <from>. + * + * It is important to note that the function relies on the fact that all names + * have already been resolved. + */ +void propagate_processes(struct proxy *from, struct proxy *to) +{ + struct switching_rule *rule; + struct hdr_exp *exp; + + if (to) { + /* check whether we need to go down */ + if (from->bind_proc && + (from->bind_proc & to->bind_proc) == from->bind_proc) + return; + + if (!from->bind_proc && !to->bind_proc) + return; + + to->bind_proc = from->bind_proc ? + (to->bind_proc | from->bind_proc) : 0; + + /* now propagate down */ + from = to; + } + + if (!from->cap & PR_CAP_FE) + return; + + /* default_backend */ + if (from->defbe.be) + propagate_processes(from, from->defbe.be); + + /* use_backend */ + list_for_each_entry(rule, &from->switching_rules, list) { + to = rule->be.backend; + propagate_processes(from, to); + } + + /* reqsetbe */ + for (exp = from->req_exp; exp != NULL; exp = exp->next) { + if (exp->action != ACT_SETBE) + continue; + to = (struct proxy *)exp->replace; + propagate_processes(from, to); + } +} + /* * Returns the error code, 0 if OK, or any combination of : * - ERR_ABORT: must abort ASAP @@ -6162,11 +6220,6 @@ int check_config_validity() } else { free(curproxy->defbe.name); curproxy->defbe.be = target; - /* we force the backend to be present on at least all of - * the frontend's processes. - */ - target->bind_proc = curproxy->bind_proc ? - (target->bind_proc | curproxy->bind_proc) : 0; /* Emit a warning if this proxy also has some servers */ if (curproxy->srv) { @@ -6199,11 +6252,6 @@ int check_config_validity() } else { free((void *)exp->replace); exp->replace = (const char *)target; - /* we force the backend to be present on at least all of - * the frontend's processes. - */ - target->bind_proc = curproxy->bind_proc ? - (target->bind_proc | curproxy->bind_proc) : 0; } } } @@ -6252,15 +6300,10 @@ int check_config_validity() } else { free((void *)rule->be.name); rule->be.backend = target; - /* we force the backend to be present on at least all of - * the frontend's processes. - */ - target->bind_proc = curproxy->bind_proc ? - (target->bind_proc | curproxy->bind_proc) : 0; } } - /* find the target proxy for 'use_backend' rules */ + /* find the target server for 'use_server' rules */ list_for_each_entry(srule, &curproxy->server_rules, list) { struct server *target = findserver(curproxy, srule->srv.name); @@ -7131,6 +7174,12 @@ out_uri_auth_compat: } } + /* At this point, target names have already been resolved */ + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { + if (curproxy->cap & PR_CAP_FE) + propagate_processes(curproxy, NULL); + } + /* automatically compute fullconn if not set. We must not do it in the * loop above because cross-references are not yet fully resolved. */ -- 1.8.4.5 ++++++ 0009-MEDIUM-config-make-the-frontends-automatically-bind-.patch ++++++ >From e56c4f1f76c6731a5a0f4b128540071cffeb1951 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 13:21:03 +0200 Subject: [PATCH 09/15] MEDIUM: config: make the frontends automatically bind to the listeners' processes When a frontend does not have any bind-process directive, make it automatically bind to the union of all of its listeners' processes instead of binding to all processes. That will make it possible to have the expected behaviour without having to explicitly specify a bind-process directive. Note that if the listeners are not bound to a specific process, the default is still to bind to all processes. This change could be backported to 1.5 as it simplifies process management, and was planned to be done during the 1.5 development phase. (cherry picked from commit b369a045d545b41ef2b250bf747caf83c97e0ca8) --- doc/configuration.txt | 4 ++++ src/cfgparse.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/doc/configuration.txt b/doc/configuration.txt index 3c75c92..1e32057 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -1905,6 +1905,10 @@ bind-process [ all | odd | even | <number 1-64>[-<number 1-64>] ] ... Each "bind" line may further be limited to a subset of the proxy's processes, please consult the "process" bind keyword in section 5.1. + When a frontend has no explicit "bind-process" line, it tries to bind to all + the processes referenced by its "bind" lines. That means that frontends can + easily adapt to their listeners' processes. + If some backends are referenced by frontends bound to other processes, the backend automatically inherits the frontend's processes. diff --git a/src/cfgparse.c b/src/cfgparse.c index b9853ef..d53f69e 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -7175,11 +7175,47 @@ out_uri_auth_compat: } /* At this point, target names have already been resolved */ + + /* Make each frontend inherit bind-process from its listeners when not specified. */ + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { + if (curproxy->bind_proc) + continue; + + list_for_each_entry(bind_conf, &curproxy->conf.bind, by_fe) { + unsigned long mask; + + mask = bind_conf->bind_proc ? bind_conf->bind_proc : ~0UL; + curproxy->bind_proc |= mask; + } + + if (!curproxy->bind_proc) + curproxy->bind_proc = ~0UL; + } + + if (global.stats_fe) { + list_for_each_entry(bind_conf, &global.stats_fe->conf.bind, by_fe) { + unsigned long mask; + + mask = bind_conf->bind_proc ? bind_conf->bind_proc : ~0UL; + global.stats_fe->bind_proc |= mask; + } + if (!global.stats_fe->bind_proc) + global.stats_fe->bind_proc = ~0UL; + } + + /* propagate bindings from frontends to backends */ for (curproxy = proxy; curproxy; curproxy = curproxy->next) { if (curproxy->cap & PR_CAP_FE) propagate_processes(curproxy, NULL); } + /* Bind each unbound backend to all processes when not specified. */ + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { + if (curproxy->bind_proc) + continue; + curproxy->bind_proc = ~0UL; + } + /* automatically compute fullconn if not set. We must not do it in the * loop above because cross-references are not yet fully resolved. */ -- 1.8.4.5 ++++++ 0010-MEDIUM-config-compute-the-exact-bind-process-before-.patch ++++++ >From 91b00c2194b728ccd61133cca83f03de3650b674 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 13:41:21 +0200 Subject: [PATCH 10/15] MEDIUM: config: compute the exact bind-process before listener's maxaccept This is a continuation of previous patch, the listener's maxaccept is divided by the number of processes, so it's best if we can swap the two blocks so that the number of processes is already known when computing the maxaccept value. (cherry picked from commit 419ead8eca9237f9cc2ec32630d96fde333282ee) --- src/cfgparse.c | 156 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 81 insertions(+), 75 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index d53f69e..f3907bf 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -6042,12 +6042,11 @@ int check_config_validity() proxy = next; } - while (curproxy != NULL) { + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { struct switching_rule *rule; struct server_rule *srule; struct sticking_rule *mrule; struct tcp_rule *trule; - struct listener *listener; unsigned int next_id; int nbproc; @@ -6115,14 +6114,6 @@ int check_config_validity() } } - /* here, if bind_proc is null, it means no limit, otherwise it's explicit. - * We now check how many processes the proxy will effectively run on. - */ - - nbproc = global.nbproc; - if (curproxy->bind_proc) - nbproc = popcount(curproxy->bind_proc & nbits(global.nbproc)); - if (global.nbproc > 1 && curproxy->table.peers.name) { Alert("Proxy '%s': peers can't be used in multi-process mode (nbproc > 1).\n", curproxy->id); @@ -7005,6 +6996,86 @@ out_uri_auth_compat: if (curproxy->options2 & PR_O2_RDPC_PRST) curproxy->be_req_ana |= AN_REQ_PRST_RDP_COOKIE; } + } + + /***********************************************************/ + /* At this point, target names have already been resolved. */ + /***********************************************************/ + + /* Check multi-process mode compatibility */ + + if (global.nbproc > 1 && global.stats_fe) { + list_for_each_entry(bind_conf, &global.stats_fe->conf.bind, by_fe) { + unsigned long mask; + + mask = nbits(global.nbproc); + if (global.stats_fe->bind_proc) + mask &= global.stats_fe->bind_proc; + + if (bind_conf->bind_proc) + mask &= bind_conf->bind_proc; + + /* stop here if more than one process is used */ + if (popcount(mask) > 1) + break; + } + if (&bind_conf->by_fe != &global.stats_fe->conf.bind) { + Warning("stats socket will not work as expected in multi-process mode (nbproc > 1), you should force process binding globally using 'stats bind-process' or per socket using the 'process' attribute.\n"); + } + } + + /* Make each frontend inherit bind-process from its listeners when not specified. */ + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { + if (curproxy->bind_proc) + continue; + + list_for_each_entry(bind_conf, &curproxy->conf.bind, by_fe) { + unsigned long mask; + + mask = bind_conf->bind_proc ? bind_conf->bind_proc : ~0UL; + curproxy->bind_proc |= mask; + } + + if (!curproxy->bind_proc) + curproxy->bind_proc = ~0UL; + } + + if (global.stats_fe) { + list_for_each_entry(bind_conf, &global.stats_fe->conf.bind, by_fe) { + unsigned long mask; + + mask = bind_conf->bind_proc ? bind_conf->bind_proc : ~0UL; + global.stats_fe->bind_proc |= mask; + } + if (!global.stats_fe->bind_proc) + global.stats_fe->bind_proc = ~0UL; + } + + /* propagate bindings from frontends to backends */ + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { + if (curproxy->cap & PR_CAP_FE) + propagate_processes(curproxy, NULL); + } + + /* Bind each unbound backend to all processes when not specified. */ + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { + if (curproxy->bind_proc) + continue; + curproxy->bind_proc = ~0UL; + } + + /*******************************************************/ + /* At this step, all proxies have a non-null bind_proc */ + /*******************************************************/ + + /* perform the final checks before creating tasks */ + + for (curproxy = proxy; curproxy; curproxy = curproxy->next) { + struct listener *listener; + unsigned int next_id; + int nbproc; + + nbproc = popcount(curproxy->bind_proc & nbits(global.nbproc)); #ifdef USE_OPENSSL /* Configure SSL for each bind line. @@ -7149,71 +7220,6 @@ out_uri_auth_compat: curproxy->id); cfgerr++; } - - curproxy = curproxy->next; - } - - /* Check multi-process mode compatibility */ - if (global.nbproc > 1 && global.stats_fe) { - list_for_each_entry(bind_conf, &global.stats_fe->conf.bind, by_fe) { - unsigned long mask; - - mask = nbits(global.nbproc); - if (global.stats_fe->bind_proc) - mask &= global.stats_fe->bind_proc; - - if (bind_conf->bind_proc) - mask &= bind_conf->bind_proc; - - /* stop here if more than one process is used */ - if (popcount(mask) > 1) - break; - } - if (&bind_conf->by_fe != &global.stats_fe->conf.bind) { - Warning("stats socket will not work as expected in multi-process mode (nbproc > 1), you should force process binding globally using 'stats bind-process' or per socket using the 'process' attribute.\n"); - } - } - - /* At this point, target names have already been resolved */ - - /* Make each frontend inherit bind-process from its listeners when not specified. */ - for (curproxy = proxy; curproxy; curproxy = curproxy->next) { - if (curproxy->bind_proc) - continue; - - list_for_each_entry(bind_conf, &curproxy->conf.bind, by_fe) { - unsigned long mask; - - mask = bind_conf->bind_proc ? bind_conf->bind_proc : ~0UL; - curproxy->bind_proc |= mask; - } - - if (!curproxy->bind_proc) - curproxy->bind_proc = ~0UL; - } - - if (global.stats_fe) { - list_for_each_entry(bind_conf, &global.stats_fe->conf.bind, by_fe) { - unsigned long mask; - - mask = bind_conf->bind_proc ? bind_conf->bind_proc : ~0UL; - global.stats_fe->bind_proc |= mask; - } - if (!global.stats_fe->bind_proc) - global.stats_fe->bind_proc = ~0UL; - } - - /* propagate bindings from frontends to backends */ - for (curproxy = proxy; curproxy; curproxy = curproxy->next) { - if (curproxy->cap & PR_CAP_FE) - propagate_processes(curproxy, NULL); - } - - /* Bind each unbound backend to all processes when not specified. */ - for (curproxy = proxy; curproxy; curproxy = curproxy->next) { - if (curproxy->bind_proc) - continue; - curproxy->bind_proc = ~0UL; } /* automatically compute fullconn if not set. We must not do it in the -- 1.8.4.5 ++++++ 0011-MEDIUM-config-only-warn-if-stats-are-attached-to-mul.patch ++++++ >From 036a83e9c300a42386cd378022420e52a43b314f Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 15:11:04 +0200 Subject: [PATCH 11/15] MEDIUM: config: only warn if stats are attached to multi-process bind directives Some users want to have a stats frontend with one line per process, but while 100% valid and safe, the config parser emits a warning. Relax this check to ensure that the warning is only emitted if at least one of the listeners is bound to multiple processes, or if the directive is placed in a backend called from multiple processes (since in this case we don't know if it's safe). (cherry picked from commit eb791e03b5c5abfddb24a439fa6434788db026b7) --- src/cfgparse.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index f3907bf..5668393 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -7189,8 +7189,19 @@ out_uri_auth_compat: if (nbproc > 1) { if (curproxy->uri_auth) { - Warning("Proxy '%s': in multi-process mode, stats will be limited to process assigned to the current request.\n", - curproxy->id); + int count, maxproc = 0; + + list_for_each_entry(bind_conf, &curproxy->conf.bind, by_fe) { + count = popcount(bind_conf->bind_proc); + if (count > maxproc) + maxproc = count; + } + /* backends have 0, frontends have 1 or more */ + if (maxproc != 1) + Warning("Proxy '%s': in multi-process mode, stats will be" + " limited to process assigned to the current request.\n", + curproxy->id); + if (!LIST_ISEMPTY(&curproxy->uri_auth->admin_rules)) { Warning("Proxy '%s': stats admin will not work correctly in multi-process mode.\n", curproxy->id); -- 1.8.4.5 ++++++ 0012-MEDIUM-config-report-it-when-tcp-request-rules-are-m.patch ++++++ >From 8b3c808c37dd5672f87e7b61085295e1316a6694 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 15:39:51 +0200 Subject: [PATCH 12/15] MEDIUM: config: report it when tcp-request rules are misplaced A config where a tcp-request rule appears after an http-request rule might seem valid but it is not. So let's report a warning about this since this case is hard to detect by the naked eye. (cherry picked from commit 3986b9c14037f446f5f5bec6207a39e1bd753fae) --- include/common/cfgparse.h | 2 ++ src/cfgparse.c | 38 ++++++++++++++++++++++++++++++++++++++ src/proto_tcp.c | 4 ++++ 3 files changed, 44 insertions(+) diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h index 80310ae..86a0035 100644 --- a/include/common/cfgparse.h +++ b/include/common/cfgparse.h @@ -73,6 +73,8 @@ int check_config_validity(); int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf, const char *file, int line, char **err); int cfg_register_section(char *section_name, int (*section_parser)(const char *, int, char **, int)); +int warnif_misplaced_tcp_conn(struct proxy *proxy, const char *file, int line, const char *arg); +int warnif_misplaced_tcp_cont(struct proxy *proxy, const char *file, int line, const char *arg); /* * Sends a warning if proxy <proxy> does not have at least one of the diff --git a/src/cfgparse.c b/src/cfgparse.c index 5668393..9ff44e9 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -317,6 +317,19 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf, return 0; } +/* Report a warning if a rule is placed after a 'tcp-request content' rule. + * Return 1 if the warning has been emitted, otherwise 0. + */ +int warnif_rule_after_tcp_cont(struct proxy *proxy, const char *file, int line, const char *arg) +{ + if (!LIST_ISEMPTY(&proxy->tcp_req.inspect_rules)) { + Warning("parsing [%s:%d] : a '%s' rule placed after a 'tcp-request content' rule will still be processed before.\n", + file, line, arg); + return 1; + } + return 0; +} + /* Report a warning if a rule is placed after a 'block' rule. * Return 1 if the warning has been emitted, otherwise 0. */ @@ -408,6 +421,31 @@ int warnif_rule_after_use_server(struct proxy *proxy, const char *file, int line return 0; } +/* report a warning if a "tcp request connection" rule is dangerously placed */ +int warnif_misplaced_tcp_conn(struct proxy *proxy, const char *file, int line, const char *arg) +{ + return warnif_rule_after_tcp_cont(proxy, file, line, arg) || + warnif_rule_after_block(proxy, file, line, arg) || + warnif_rule_after_http_req(proxy, file, line, arg) || + warnif_rule_after_reqxxx(proxy, file, line, arg) || + warnif_rule_after_reqadd(proxy, file, line, arg) || + warnif_rule_after_redirect(proxy, file, line, arg) || + warnif_rule_after_use_backend(proxy, file, line, arg) || + warnif_rule_after_use_server(proxy, file, line, arg); +} + +/* report a warning if a "tcp request content" rule is dangerously placed */ +int warnif_misplaced_tcp_cont(struct proxy *proxy, const char *file, int line, const char *arg) +{ + return warnif_rule_after_block(proxy, file, line, arg) || + warnif_rule_after_http_req(proxy, file, line, arg) || + warnif_rule_after_reqxxx(proxy, file, line, arg) || + warnif_rule_after_reqadd(proxy, file, line, arg) || + warnif_rule_after_redirect(proxy, file, line, arg) || + warnif_rule_after_use_backend(proxy, file, line, arg) || + warnif_rule_after_use_server(proxy, file, line, arg); +} + /* report a warning if a block rule is dangerously placed */ int warnif_misplaced_block(struct proxy *proxy, const char *file, int line, const char *arg) { diff --git a/src/proto_tcp.c b/src/proto_tcp.c index 72dc92b..940c3f1 100644 --- a/src/proto_tcp.c +++ b/src/proto_tcp.c @@ -1711,6 +1711,8 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx, warn++; } + /* the following function directly emits the warning */ + warnif_misplaced_tcp_cont(curpx, file, line, args[0]); LIST_ADDQ(&curpx->tcp_req.inspect_rules, &rule->list); } else if (strcmp(args[1], "connection") == 0) { @@ -1754,6 +1756,8 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx, warn++; } + /* the following function directly emits the warning */ + warnif_misplaced_tcp_conn(curpx, file, line, args[0]); LIST_ADDQ(&curpx->tcp_req.l4_rules, &rule->list); } else { -- 1.8.4.5 ++++++ 0013-MINOR-config-detect-the-case-where-a-tcp-request-con.patch ++++++ >From 7fc7ebd5785629074297ee324b22e0aee9ad00f9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Tue, 16 Sep 2014 16:21:19 +0200 Subject: [PATCH 13/15] MINOR: config: detect the case where a tcp-request content rule has no inspect-delay If a frontend has any tcp-request content rule relying on request contents without any inspect delay, we now emit a warning as this will randomly match. This can be backported to 1.5 as it reduces the support effort. (cherry picked from commit e42bd96d0acc38ea7c546c8de8115ffd1dd6c3f3) --- src/cfgparse.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/cfgparse.c b/src/cfgparse.c index 9ff44e9..f723a3a 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -6998,6 +6998,29 @@ out_uri_auth_compat: newsrv = newsrv->next; } + /* check if we have a frontend with "tcp-request content" looking at L7 + * with no inspect-delay + */ + if ((curproxy->cap & PR_CAP_FE) && !curproxy->tcp_req.inspect_delay) { + list_for_each_entry(trule, &curproxy->tcp_req.inspect_rules, list) { + if (trule->action == TCP_ACT_CAPTURE && + !(trule->act_prm.cap.expr->fetch->val & SMP_VAL_FE_SES_ACC)) + break; + if ((trule->action >= TCP_ACT_TRK_SC0 && trule->action <= TCP_ACT_TRK_SCMAX) && + !(trule->act_prm.trk_ctr.expr->fetch->val & SMP_VAL_FE_SES_ACC)) + break; + } + + if (&trule->list != &curproxy->tcp_req.inspect_rules) { + Warning("config : %s '%s' : some 'tcp-request content' rules explicitly depending on request" + " contents were found in a frontend without any 'tcp-request inspect-delay' setting." + " This means that these rules will randomly find their contents. This can be fixed by" + " setting the tcp-request inspect-delay.\n", + proxy_type_str(curproxy), curproxy->id); + err_code |= ERR_WARN; + } + } + if (curproxy->cap & PR_CAP_FE) { if (!curproxy->accept) curproxy->accept = frontend_accept; -- 1.8.4.5 ++++++ 0014-MEDIUM-systemd-wrapper-support-multiple-executable-v.patch ++++++ >From afbfc27c0f2cac29e18f87b36335ea821c633b9d Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Fri, 19 Sep 2014 15:42:30 +0200 Subject: [PATCH 14/15] MEDIUM: systemd-wrapper: support multiple executable versions and names Having to use a hard-coded "haproxy" executable name next to the systemd wrapper is not always convenient, as it's sometimes desirable to run with multiple versions in parallel. Thus this patch performs a minor change to the wrapper : if the name ends with "-systemd-wrapper", then it trims that part off and what remains becomes the target haproxy executable. That makes it easy to have for example : haproxy-1.5.4-systemd-wrapper haproxy-1.5.4 haproxy-1.5.3-systemd-wrapper haproxy-1.5.3 and so on, in a same directory. This patch also fixes a rare bug caused by readlink() not adding the trailing zero and leaving possible existing contents, including possibly a randomly placed "/" which would make it unable to locate the correct binary. This case is not totally unlikely as I got a \177 a few times at the end of the executable names, so I could have got a '/' as well. Back-porting to 1.5 is desirable. (cherry picked from commit ceaf2aec1ec1612da461c61798e944693144bee9) --- src/haproxy-systemd-wrapper.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/haproxy-systemd-wrapper.c b/src/haproxy-systemd-wrapper.c index cc8baa8..446f28f 100644 --- a/src/haproxy-systemd-wrapper.c +++ b/src/haproxy-systemd-wrapper.c @@ -28,20 +28,36 @@ static char *pid_file = "/run/haproxy.pid"; static int wrapper_argc; static char **wrapper_argv; +/* returns the path to the haproxy binary into <buffer>, whose size indicated + * in <buffer_size> must be at least 1 byte long. + */ static void locate_haproxy(char *buffer, size_t buffer_size) { char *end = NULL; + int len; - if (readlink("/proc/self/exe", buffer, buffer_size) > 0) - end = strrchr(buffer, '/'); + len = readlink("/proc/self/exe", buffer, buffer_size - 1); + if (len == -1) + goto fail; - if (end == NULL) { - strncpy(buffer, "/usr/sbin/haproxy", buffer_size); + buffer[len] = 0; + end = strrchr(buffer, '/'); + if (end == NULL) + goto fail; + + if (strcmp(end + strlen(end) - 16, "-systemd-wrapper") == 0) { + end[strlen(end) - 16] = '\0'; return; } + end[1] = '\0'; strncpy(end + 1, "haproxy", buffer + buffer_size - (end + 1)); buffer[buffer_size - 1] = '\0'; + return; + fail: + strncpy(buffer, "/usr/sbin/haproxy", buffer_size); + buffer[buffer_size - 1] = '\0'; + return; } static void spawn_haproxy(char **pid_strv, int nb_pid) @@ -54,7 +70,8 @@ static void spawn_haproxy(char **pid_strv, int nb_pid) main_argc = wrapper_argc - 1; main_argv = wrapper_argv + 1; - pid = fork(); + //pid = fork(); + pid=0; if (!pid) { /* 3 for "haproxy -Ds -sf" */ char **argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *)); -- 1.8.4.5 ++++++ 0015-BUG-MEDIUM-remove-debugging-code-from-systemd-wrappe.patch ++++++ >From 575e299cc07f5f2b314d91dfac8671834cbdd2a7 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w(a)1wt.eu> Date: Wed, 24 Sep 2014 12:59:25 +0200 Subject: [PATCH 15/15] BUG/MEDIUM: remove debugging code from systemd-wrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Kristoffer Grönlund reported that after my recent update to the systemd-wrapper, I accidentely left the debugging code which consists in disabling the fork :-( The fix needs to be backported to 1.5 as well since I pushed it there as well. (cherry picked from commit a55bbc64d8272e4066a67b6d190ffebaff2b300a) --- src/haproxy-systemd-wrapper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/haproxy-systemd-wrapper.c b/src/haproxy-systemd-wrapper.c index 446f28f..8602881 100644 --- a/src/haproxy-systemd-wrapper.c +++ b/src/haproxy-systemd-wrapper.c @@ -70,8 +70,7 @@ static void spawn_haproxy(char **pid_strv, int nb_pid) main_argc = wrapper_argc - 1; main_argv = wrapper_argv + 1; - //pid = fork(); - pid=0; + pid = fork(); if (!pid) { /* 3 for "haproxy -Ds -sf" */ char **argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *)); -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit courier-imap for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package courier-imap for openSUSE:Factory checked in at 2014-09-26 10:52:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/courier-imap (Old) and /work/SRC/openSUSE:Factory/.courier-imap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "courier-imap" Changes: -------- --- /work/SRC/openSUSE:Factory/courier-imap/courier-imap.changes 2014-03-20 07:04:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.courier-imap.new/courier-imap.changes 2014-09-26 11:21:47.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 25 15:19:51 UTC 2014 - chris(a)computersalat.de + +- fix courier-imap.service + * STARTTLS on port 143 (thanks to cschweingruber) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ courier-imap.service ++++++ --- /var/tmp/diff_new_pack.stzhd9/_old 2014-09-26 11:21:48.000000000 +0200 +++ /var/tmp/diff_new_pack.stzhd9/_new 2014-09-26 11:21:48.000000000 +0200 @@ -13,7 +13,10 @@ LimitNOFILE=65536 ExecStart=/usr/bin/env - /bin/sh -c " set -a ; \ . /etc/courier/imapd ; \ + grep IMAPDSTARTTLS=NO /etc/courier/imapd-ssl &>/dev/null || . /etc/courier/imapd-ssl ; \ + IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \ PROXY_HOSTNAME=$PROXY_HOSTNAME ; \ + TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \ /usr/sbin/courierlogger -pid=$PIDFILE -start $LOGGEROPTS \ /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \ -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP $TCPDOPTS \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apache2-mod_perl for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package apache2-mod_perl for openSUSE:Factory checked in at 2014-09-26 10:52:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_perl (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_perl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2-mod_perl" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_perl/apache2-mod_perl.changes 2014-08-27 07:46:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2-mod_perl.new/apache2-mod_perl.changes 2014-09-26 11:21:46.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 17 10:35:26 UTC 2014 - jsegitz(a)suse.com + +- Changed access control statements in config file to use + mod_authz_host (bnc#897005) + +------------------------------------------------------------------- +Tue Sep 9 12:48:46 UTC 2014 - vcizek(a)suse.com + +- adapt test configuration for apache24 to fix build + * use the new access control mechanisms from apache24 + * added apache24-mod_authz_host.patch + +------------------------------------------------------------------- New: ---- apache24-mod_authz_host.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_perl.spec ++++++ --- /var/tmp/diff_new_pack.0rX3SU/_old 2014-09-26 11:21:47.000000000 +0200 +++ /var/tmp/diff_new_pack.0rX3SU/_new 2014-09-26 11:21:47.000000000 +0200 @@ -60,6 +60,7 @@ # PATCH-NEEDS-REBASE Patch1: lfs-perl-5.14.patch Patch2: avoid-broken-provides.diff +Patch3: apache24-mod_authz_host.patch Icon: mod_perl.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -116,6 +117,7 @@ #%setup -q -n modperl-2.0 -a 1 %setup -q -n httpd24 %patch2 -p1 +%patch3 -p1 #%patch1 -p1 find -name ".svn" -type d | xargs rm -rfv @@ -237,8 +239,13 @@ <Directory "%{apache_serverroot}/perl-lib"> AllowOverride None Options None + <IfModule !mod_authz_host.c> Order allow,deny Deny from all + </IfModule> + <IfModule mod_authz_host.c> + Require all granted + </IfModule> </Directory> <IfModule mod_perl.c> PerlRequire "/etc/apache2/mod_perl-startup.pl" ++++++ apache24-mod_authz_host.patch ++++++ diff --git a/t/filter/TestFilter/both_str_req_proxy.pm b/t/filter/TestFilter/both_str_req_proxy.pm index 9e2ba81..4d0b72b 100644 --- a/t/filter/TestFilter/both_str_req_proxy.pm +++ b/t/filter/TestFilter/both_str_req_proxy.pm @@ -62,9 +62,7 @@ __DATA__ <IfModule mod_proxy.c> <Proxy http://@servername@:@port@/*> <IfModule @ACCESS_MODULE@> - Order Deny,Allow - Deny from all - Allow from @servername@ + Require host @servername@ </IfModule> </Proxy> diff --git a/t/protocol/TestProtocol/pseudo_http.pm b/t/protocol/TestProtocol/pseudo_http.pm index bb49ec8..1b8e93b 100644 --- a/t/protocol/TestProtocol/pseudo_http.pm +++ b/t/protocol/TestProtocol/pseudo_http.pm @@ -154,9 +154,9 @@ __END__ <Location TestProtocol::pseudo_http> + <RequireAny> <IfModule @ACCESS_MODULE@> - Order Deny,Allow - Allow from @servername@ + Require host @servername@ </IfModule> <IfModule @AUTH_MODULE@> @@ -168,7 +168,7 @@ __END__ AuthName TestProtocol::pseudo_http AuthType Basic Require user stas - Satisfy any + </RequireAny> </Location> diff --git a/t/response/TestAPI/access2.pm b/t/response/TestAPI/access2.pm index 718800e..836d54a 100644 --- a/t/response/TestAPI/access2.pm +++ b/t/response/TestAPI/access2.pm @@ -101,9 +101,10 @@ PerlAddAuthzProvider my-group TestAPI::access2->authz_handler PerlResponseHandler Apache::TestHandler::ok1 SetHandler modperl + <RequireAll> <IfModule @ACCESS_MODULE@> # needed to test $r->satisfies - Allow from All + Require all granted </IfModule> AuthType Basic AuthName "Access" @@ -112,7 +113,7 @@ PerlAddAuthzProvider my-group TestAPI::access2->authz_handler <Limit POST> Require valid-user </Limit> - Satisfy All + </RequireAll> <IfModule @AUTH_MODULE@> # htpasswd -mbc auth-users goo foo # htpasswd -mb auth-users bar mar diff --git a/t/response/TestModules/proxy.pm b/t/response/TestModules/proxy.pm index ab59026..91e251e 100644 --- a/t/response/TestModules/proxy.pm +++ b/t/response/TestModules/proxy.pm @@ -47,9 +47,7 @@ __END__ <IfModule mod_proxy.c> <Proxy http://@servername@:@port@/*> <IfModule @ACCESS_MODULE@> - Order Deny,Allow - Deny from all - Allow from @servername@ + Require host @servername@ </IfModule> </Proxy> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnetfilter_log for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package libnetfilter_log for openSUSE:Factory checked in at 2014-09-26 10:52:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnetfilter_log (Old) and /work/SRC/openSUSE:Factory/.libnetfilter_log.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnetfilter_log" Changes: -------- --- /work/SRC/openSUSE:Factory/libnetfilter_log/libnetfilter_log.changes 2012-12-14 09:38:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnetfilter_log.new/libnetfilter_log.changes 2014-09-26 11:21:45.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 15:43:40 UTC 2014 - jengelh(a)inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_log.spec ++++++ --- /var/tmp/diff_new_pack.7h6hXY/_old 2014-09-26 11:21:46.000000000 +0200 +++ /var/tmp/diff_new_pack.7h6hXY/_new 2014-09-26 11:21:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_log # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -25,6 +25,7 @@ Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_log/ +#Git-Clone: git://git.netfilter.org/libnetfilter_log Source: ftp://ftp.netfilter.org/pub/libnetfilter_log/%name-%version.tar.bz2 Source2: ftp://ftp.netfilter.org/pub/libnetfilter_log/%name-%version.tar.bz2.sig Source3: baselibs.conf @@ -32,14 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: autoconf, automake >= 1.6, libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libnfnetlink) >= 0.0.41 -%else -BuildRequires: libnfnetlink-devel >= 0.0.41 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libnetfilter_log is a userspace library providing interface to @@ -58,10 +52,10 @@ logging. This library has been previously known as libnfnetlink_log. %package devel -Requires: %lname = %version -Requires: libnfnetlink-devel Summary: Userspace library for accessing logged packets Group: Development/Libraries/C and C++ +Requires: %lname = %version +Requires: libnfnetlink-devel %description devel libnetfilter_log is a userspace library providing interface to @@ -70,9 +64,6 @@ logging. This library has been previously known as libnfnetlink_log. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnetfilter_queue for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package libnetfilter_queue for openSUSE:Factory checked in at 2014-09-26 10:52:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnetfilter_queue (Old) and /work/SRC/openSUSE:Factory/.libnetfilter_queue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnetfilter_queue" Changes: -------- --- /work/SRC/openSUSE:Factory/libnetfilter_queue/libnetfilter_queue.changes 2012-12-14 09:38:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnetfilter_queue.new/libnetfilter_queue.changes 2014-09-26 11:21:44.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 15:43:40 UTC 2014 - jengelh(a)inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_queue.spec ++++++ --- /var/tmp/diff_new_pack.CtXzPE/_old 2014-09-26 11:21:45.000000000 +0200 +++ /var/tmp/diff_new_pack.CtXzPE/_new 2014-09-26 11:21:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_queue # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -32,20 +32,11 @@ Source3: baselibs.conf Source4: %name.keyring Patch1: rhel6-iptos.diff - BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libnfnetlink) >= 0.0.41 -%else -BuildRequires: libmnl-devel >= 1.0.3 -BuildRequires: libnfnetlink-devel >= 0.0.41 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description libnetfilter_queue is a userspace library providing an API to packets @@ -66,10 +57,10 @@ libnetfilter_queue has been previously known as libnfnetlink_queue. %package devel -Requires: %lname = %version -Requires: libnfnetlink-devel Summary: Userspace library for packets that have been queued by the kernel packet filter Group: Development/Libraries/C and C++ +Requires: %lname = %version +Requires: libnfnetlink-devel %description devel libnetfilter_queue is a userspace library providing an API to packets @@ -79,9 +70,6 @@ libnetfilter_queue has been previously known as libnfnetlink_queue. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %patch -P 1 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnetfilter_cttimeout for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package libnetfilter_cttimeout for openSUSE:Factory checked in at 2014-09-26 10:52:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnetfilter_cttimeout (Old) and /work/SRC/openSUSE:Factory/.libnetfilter_cttimeout.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnetfilter_cttimeout" Changes: -------- --- /work/SRC/openSUSE:Factory/libnetfilter_cttimeout/libnetfilter_cttimeout.changes 2012-12-14 09:38:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnetfilter_cttimeout.new/libnetfilter_cttimeout.changes 2014-09-26 11:21:43.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 15:43:40 UTC 2014 - jengelh(a)inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_cttimeout.spec ++++++ --- /var/tmp/diff_new_pack.rjznuU/_old 2014-09-26 11:21:44.000000000 +0200 +++ /var/tmp/diff_new_pack.rjznuU/_new 2014-09-26 11:21:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_cttimeout # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -34,14 +34,7 @@ #git#BuildRequires: autoconf, automake >= 1.6, libtool BuildRequires: glibc-devel >= 2.9 BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.0 -%else -BuildRequires: libmnl-devel >= 1.0.0 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description This library provides the programming interface (API) to the @@ -56,18 +49,15 @@ Netfilter extended timeout settings infrastructure. %package devel -Requires: %lname = %version Summary: Userspace library for the Netfilter Conntrack Timeout extension Group: Development/Libraries/C and C++ +Requires: %lname = %version %description devel This library provides the programming interface (API) to the Netfilter extended timeout settings infrastructure. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnetfilter_cthelper for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package libnetfilter_cthelper for openSUSE:Factory checked in at 2014-09-26 10:52:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnetfilter_cthelper (Old) and /work/SRC/openSUSE:Factory/.libnetfilter_cthelper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnetfilter_cthelper" Changes: -------- --- /work/SRC/openSUSE:Factory/libnetfilter_cthelper/libnetfilter_cthelper.changes 2012-12-14 09:37:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnetfilter_cthelper.new/libnetfilter_cthelper.changes 2014-09-26 11:21:42.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 15:43:40 UTC 2014 - jengelh(a)inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_cthelper.spec ++++++ --- /var/tmp/diff_new_pack.drTaXc/_old 2014-09-26 11:21:43.000000000 +0200 +++ /var/tmp/diff_new_pack.drTaXc/_new 2014-09-26 11:21:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_cthelper # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -36,14 +36,7 @@ #BuildRequires: automake >= 1.6 #BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.0 -%else -BuildRequires: libmnl-devel >= 1.0.0 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description This library provides the programming interface (API) to the @@ -58,18 +51,15 @@ Netfilter userspace helper infrastructure. %package devel -Requires: %lname = %version Summary: Userspace library for the Netfilter Conntrack Helper extension Group: Development/Libraries/C and C++ +Requires: %lname = %version %description devel This library provides the programming interface (API) to the Netfilter userspace helper infrastructure. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnetfilter_acct for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package libnetfilter_acct for openSUSE:Factory checked in at 2014-09-26 10:52:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnetfilter_acct (Old) and /work/SRC/openSUSE:Factory/.libnetfilter_acct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnetfilter_acct" Changes: -------- --- /work/SRC/openSUSE:Factory/libnetfilter_acct/libnetfilter_acct.changes 2013-03-08 13:23:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnetfilter_acct.new/libnetfilter_acct.changes 2014-09-26 11:21:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 15:43:40 UTC 2014 - jengelh(a)inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnetfilter_acct.spec ++++++ --- /var/tmp/diff_new_pack.0m0iqP/_old 2014-09-26 11:21:42.000000000 +0200 +++ /var/tmp/diff_new_pack.0m0iqP/_new 2014-09-26 11:21:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_acct # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -25,7 +25,6 @@ Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_acct/ -#Freecode-URL: http://freecode.com/projects/libnetfilter_acct/ #Git-Clone: git://git.netfilter.org/libnetfilter_acct #DL-URL: http://netfilter.org/projects/libnetfilter_acct/files/ Source: http://netfilter.org/projects/libnetfilter_acct/files/%name-%version.tar.bz2 @@ -35,14 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf, automake >= 1.6, libtool BuildRequires: pkgconfig >= 0.21 -%if 0%{?suse_version} >= 1210 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.0 -%else -BuildRequires: libmnl-devel >= 1.0.0 -%endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif %description This library provides the programming interface (API) to the @@ -66,7 +58,6 @@ Netfilter extended accounting infrastructure. %prep -%{?gpg_verify: %gpg_verify %{S:2}} %setup -q %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxappearance-obconf for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package lxappearance-obconf for openSUSE:Factory checked in at 2014-09-26 10:52:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxappearance-obconf (Old) and /work/SRC/openSUSE:Factory/.lxappearance-obconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxappearance-obconf" Changes: -------- --- /work/SRC/openSUSE:Factory/lxappearance-obconf/lxappearance-obconf.changes 2014-09-17 17:27:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxappearance-obconf.new/lxappearance-obconf.changes 2014-09-26 11:21:41.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 25 09:30:20 UTC 2014 - andrea(a)opensuse.org + +- added pkgconfig(ice) and pkgconfig(sm) to build requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxappearance-obconf.spec ++++++ --- /var/tmp/diff_new_pack.42JDtA/_old 2014-09-26 11:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.42JDtA/_new 2014-09-26 11:21:41.000000000 +0200 @@ -30,6 +30,8 @@ BuildRequires: pkgconfig(lxappearance) BuildRequires: pkgconfig(obrender-3.5) BuildRequires: pkgconfig(obt-3.5) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) Requires: lxappearance Requires: openbox Recommends: %{name}-lang -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit genius for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package genius for openSUSE:Factory checked in at 2014-09-26 10:52:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/genius (Old) and /work/SRC/openSUSE:Factory/.genius.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "genius" Changes: -------- --- /work/SRC/openSUSE:Factory/genius/genius.changes 2014-09-17 21:25:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.genius.new/genius.changes 2014-09-26 11:21:37.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Sep 24 12:32:14 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 1.0.19: + + New menu: Examples. These are annotated programs that show some + mathematical concept. Generally taken from the classes I have + been teaching. They are installed under + prefix/share/genius/examples/ and are mostly using graphics so + only work in the graphical GNOME/GTK version + + New plotting functions: SurfacePlotDrawLine, + SurfacePlotDrawPoints, SurfacePlotClear, PlotWindowPresent. + + New rotation animation in the surface plot window. + + Fix string constants from compiled library starting with 'E'. + + A few fixes. + + Updated translations. + +------------------------------------------------------------------- Old: ---- genius-1.0.18.tar.xz New: ---- genius-1.0.19.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ genius.spec ++++++ --- /var/tmp/diff_new_pack.DHJqwz/_old 2014-09-26 11:21:39.000000000 +0200 +++ /var/tmp/diff_new_pack.DHJqwz/_new 2014-09-26 11:21:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: genius -Version: 1.0.18 +Version: 1.0.19 Release: 0 Summary: General purpose calculator and mathematics tool License: GPL-3.0+ ++++++ genius-1.0.18.tar.xz -> genius-1.0.19.tar.xz ++++++ ++++ 36625 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

commit obconf for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package obconf for openSUSE:Factory checked in at 2014-09-26 10:52:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obconf (Old) and /work/SRC/openSUSE:Factory/.obconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obconf" Changes: -------- --- /work/SRC/openSUSE:Factory/obconf/obconf.changes 2014-05-16 07:29:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.obconf.new/obconf.changes 2014-09-26 11:21:40.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 25 09:30:20 UTC 2014 - andrea(a)opensuse.org + +- added pkgconfig(ice) and pkgconfig(sm) to build requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obconf.spec ++++++ --- /var/tmp/diff_new_pack.zJ6MUM/_old 2014-09-26 11:21:40.000000000 +0200 +++ /var/tmp/diff_new_pack.zJ6MUM/_new 2014-09-26 11:21:40.000000000 +0200 @@ -26,6 +26,8 @@ BuildRequires: xorg-x11 BuildRequires: pkgconfig(obrender-3.5) BuildRequires: pkgconfig(obt-3.5) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) Requires: openbox Version: 2.0.4 Release: 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dynamips for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package dynamips for openSUSE:Factory checked in at 2014-09-26 10:52:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dynamips (Old) and /work/SRC/openSUSE:Factory/.dynamips.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dynamips" Changes: -------- --- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes 2014-07-12 17:14:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2014-09-26 11:21:36.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 25 08:38:11 UTC 2014 - andrea(a)opensuse.org + +- new upstream version 0.2.14 + * Add optional argument 'format' to hypervisor commands 'send_con_msg' and + 'send_aux_msg'. Report "X byte(s) written" on succeess. + * String formats: + - plain - plain string (default, old behavior) + - base64 - base64 encoded string + * Fix issue with 7200 IOS crashing after restart + * Fixed issue #49 - IOS crashes after router restart + * Fixed issue #50 - vm send_con_msg + +------------------------------------------------------------------- Old: ---- dynamips-0.2.13.tar.gz New: ---- dynamips-0.2.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dynamips.spec ++++++ --- /var/tmp/diff_new_pack.yz8KbB/_old 2014-09-26 11:21:37.000000000 +0200 +++ /var/tmp/diff_new_pack.yz8KbB/_new 2014-09-26 11:21:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: dynamips -Version: 0.2.13 +Version: 0.2.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dos2unix ++++++ dynamips-0.2.13.tar.gz -> dynamips-0.2.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/CMakeLists.txt new/dynamips-0.2.14/CMakeLists.txt --- old/dynamips-0.2.13/CMakeLists.txt 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/CMakeLists.txt 2014-09-23 20:59:26.000000000 +0200 @@ -25,7 +25,7 @@ message ( STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}" ) project ( dynamips C ) -set ( DYNAMIPS_VERSION_TRAIN 0.2.13 ) +set ( DYNAMIPS_VERSION_TRAIN 0.2.14 ) set ( DYNAMIPS_VERSION_SUB ) include ( utils ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/ChangeLog new/dynamips-0.2.14/ChangeLog --- old/dynamips-0.2.13/ChangeLog 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/ChangeLog 2014-09-23 20:59:26.000000000 +0200 @@ -2924,3 +2924,23 @@ +--------------------. | Release: v0.2.13 | +--------------------' + +10-Jul-2014 to 01-Sep-2014 +-------------------------- + - Add -DUSE_UNSTABLE when making an unstable build (MacOSX) + - Add optional argument 'format' to hypervisor commands + - 'send_con_msg' and 'send_aux_msg'. + - Report "X byte(s) written" on succeess. + - String formats: + * plain - plain string (default, old behavior) + * base64 - base64 encoded string + - Use an auxiliary variable to record configured ram size for npe-400 + +Fixed issue #49 - IOS crashes after router restart +Fixed issue #50 - vm send_con_msg +Fixed issue #55 - 'unstable' installs 'stable' version on Mac OS X + ++--------------------+ +| Release: v0.2.14 | ++--------------------+ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/README.hypervisor new/dynamips-0.2.14/README.hypervisor --- old/dynamips-0.2.13/README.hypervisor 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/README.hypervisor 2014-09-23 20:59:26.000000000 +0200 @@ -224,11 +224,29 @@ The instance must exist, "cpu_id" is ignored. (since version 0.2.8-RC5-community) -* "vm send_con_msg <instance_name> <str>" : - Send a message on the console. (since version 0.2.6-RC3) +* "vm send_con_msg <instance_name> <str> [<format>]" : + (since version 0.2.6-RC3) Send a message on the console. + It only writes the bytes that fit in the console buffer. -* "vm send_aux_msg <instance_name> <str>" : - Send a message on the AUX port. (since version 0.2.6-RC3) + (since version 0.2.14) + The optional argument <format> indicates the string format. + On success it will report "X byte(s) written". + + String formats: + * plain - plain string (default, old behavior) + * base64 - base64 encoded string + +* "vm send_aux_msg <instance_name> <str> [<format>]" : + (since version 0.2.6-RC3) Send a message on the AUX port. + It only writes the bytes that fit in the aux buffer. + + (since version 0.2.14) + The optional argument <format> indicates the string format. + On success it will report "X byte(s) written". + + String formats: + * plain - plain string (default, old behavior) + * base64 - base64 encoded string * "vm slot_bindings <instance_name>" : Show slot bindings. (since version 0.2.8-RC1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/RELEASE-NOTES new/dynamips-0.2.14/RELEASE-NOTES --- old/dynamips-0.2.13/RELEASE-NOTES 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/RELEASE-NOTES 2014-09-23 20:59:26.000000000 +0200 @@ -1,31 +1,29 @@ Release Notes for Cisco router simulator (Dynamips) =================================================== -Version: v0.2.13 +Version: v0.2.14 -Release date: Thursday, July 10, 2014 (2014-07-10) +Release date: Tuesday, September 23, 2014 (2014-09-23) -Source code: https://github.com/GNS3/dynamips/tree/v0.2.13 +Source code: https://github.com/GNS3/dynamips/tree/v0.2.14 License: GNU GPLv2 -What's New since v0.2.12 +What's New since v0.2.13 ======================== -Identify 10Mbps Ethernet chip in dev_am79c971 as Am79C970A. IOS said "AMD Unknown", now it's "AMD Presidio". -Add CMake build system. -Enable the Travis Continual Integration service. -Fix Wireshark error "Frame too long" (thread safety issue could cause bad capture file data) -Make a single FAT16 partition when pcmcia disks are first created. -Improve packet transmission performance of i8254x (C7200-IO-2FE/E, C7200-I/O-GE+E, PA-2FE-TX, PA-GE) by sending up to 16 packets at a time. - - Code by candlerb (merged) -Cleanups. - -Final fix for issue #9 - Reproducable crash -Fixed issue #38 - Unknown file system detected -Fixed issue #41 - "Frame is Too Long" error in Wireshark -Merge pull request #45 from candlerb/candlerb/txperformance +Allow building unstable version on MacOSX +Add optional argument 'format' to hypervisor commands 'send_con_msg' and +'send_aux_msg'. Report "X byte(s) written" on succeess. + - String formats: + * plain - plain string (default, old behavior) + * base64 - base64 encoded string +Fix issue with 7200 IOS crashing after restart + +Fixed issue #49 - IOS crashes after router restart +Fixed issue #50 - vm send_con_msg +Fixed issue #55 - 'unstable' installs 'stable' version on Mac OS X Known Issues @@ -40,8 +38,8 @@ Packet transmission rate is limited. - https://github.com/GNS3/dynamips/issues/46 -IOS crashes after router restart - - https://github.com/GNS3/dynamips/issues/49 +c1700 IOS Images start once and then fail to boot on second boot + - https://github.com/GNS3/dynamips/issues/54 There is lots of missing hardware functionality. There are memory leaks. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/common/dev_c7200.c new/dynamips-0.2.14/common/dev_c7200.c --- old/dynamips-0.2.13/common/dev_c7200.c 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/common/dev_c7200.c 2014-09-23 20:59:26.000000000 +0200 @@ -329,6 +329,7 @@ memset(router,0,sizeof(*router)); router->vm = vm; + router->npe400_ram_size = C7200_DEFAULT_RAM_SIZE; vm->hw_data = router; vm->elf_machine_id = C7200_ELF_MACHINE_ID; @@ -1195,12 +1196,15 @@ /* * Add supplemental memory (as "iomem") if we have more than 256 Mb. */ - if (vm->ram_size > C7200_BASE_RAM_LIMIT) { - vm->iomem_size = vm->ram_size - C7200_BASE_RAM_LIMIT; + if (VM_C7200(vm)->npe400_ram_size > C7200_BASE_RAM_LIMIT) { + vm->iomem_size = VM_C7200(vm)->npe400_ram_size - C7200_BASE_RAM_LIMIT; vm->ram_size = C7200_BASE_RAM_LIMIT; - dev_ram_init(vm,"ram1",vm->ram_mmap,TRUE,NULL,vm->sparse_mem, + dev_ram_init(vm,"iomem",vm->ram_mmap,TRUE,NULL,vm->sparse_mem, C7200_IOMEM_ADDR,vm->iomem_size*1048576); } + else { + vm->iomem_size = 0; + } /* Initialize the Galileo GT-64120 system controller */ if (c7200_init_gt64120(router) == -1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/common/dev_c7200.h new/dynamips-0.2.14/common/dev_c7200.h --- old/dynamips-0.2.13/common/dev_c7200.h 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/common/dev_c7200.h 2014-09-23 20:59:26.000000000 +0200 @@ -164,6 +164,9 @@ /* Associated VM instance */ vm_instance_t *vm; + /* RAM size for npe-400 */ + m_uint32_t npe400_ram_size; + /* MV64460 device for NPE-G2 */ struct mv64460_data *mv64460_sysctr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/common/dev_vtty.c new/dynamips-0.2.14/common/dev_vtty.c --- old/dynamips-0.2.13/common/dev_vtty.c 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/common/dev_vtty.c 2014-09-23 20:59:26.000000000 +0200 @@ -618,21 +618,21 @@ return(0); } -/* Store a string in the FIFO buffer */ -int vtty_store_str(vtty_t *vtty,char *str) +/* Store arbritary data in the FIFO buffer */ +int vtty_store_data(vtty_t *vtty,char *data, int len) { - if (!vtty) - return(0); + int bytes; - while(*str != 0) { - if (vtty_store(vtty,*str) == -1) - return(-1); - - str++; + if (!vtty || !data || len < 0) + return(-1); // invalid argument + + for (bytes = 0; bytes < len; bytes++) { + if (vtty_store(vtty,data[bytes]) == -1) + break; } vtty->input_pending = TRUE; - return(0); + return(bytes); } /* Store CTRL+C in buffer */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/common/dev_vtty.h new/dynamips-0.2.14/common/dev_vtty.h --- old/dynamips-0.2.13/common/dev_vtty.h 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/common/dev_vtty.h 2014-09-23 20:59:26.000000000 +0200 @@ -101,8 +101,8 @@ /* delete a virtual tty */ void vtty_delete(vtty_t *vtty); -/* Store a string in the FIFO buffer */ -int vtty_store_str(vtty_t *vtty,char *str); +/* Store arbritary data in the FIFO buffer */ +int vtty_store_data(vtty_t *vtty,char *data, int len); /* read a character from the buffer (-1 if the buffer is empty) */ int vtty_get_char(vtty_t *vtty); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/common/dynamips.c new/dynamips-0.2.14/common/dynamips.c --- old/dynamips-0.2.13/common/dynamips.c 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/common/dynamips.c 2014-09-23 20:59:26.000000000 +0200 @@ -74,7 +74,7 @@ const char *sw_version = DYNAMIPS_VERSION"-"JIT_ARCH; /* Software version tag */ -const char *sw_version_tag = "2014071016"; +const char *sw_version_tag = "2014092320"; /* Hypervisor */ int hypervisor_mode = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/man/hypervisor_mode.7 new/dynamips-0.2.14/man/hypervisor_mode.7 --- old/dynamips-0.2.13/man/hypervisor_mode.7 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/man/hypervisor_mode.7 2014-09-23 20:59:26.000000000 +0200 @@ -274,11 +274,33 @@ The instance must exist, "cpu_id" is ignored. (since version 0.2.8\-RC5\-community) .TP -.B vm send_con_msg <instance_name> <str> -Send a message on the console. (since version 0.2.6\-RC3) +.B vm send_con_msg <instance_name> <str> [<format>] +(since version 0.2.6\-RC3) Send a message on the console. +It only writes the bytes that fit in the console buffer. +.RS +.PP +(since version 0.2.14) +The optional argument <format> indicates the string format. +On success it will report "X byte(s) written". +.PP +String formats: + * plain - plain string (default, old behavior) + * base64 - base64 encoded string +.RE .TP -.B vm send_aux_msg <instance_name> <str> -Send a message on the AUX port. (since version 0.2.6\-RC3) +.B vm send_aux_msg <instance_name> <str> [<format>] +(since version 0.2.6\-RC3) Send a message on the AUX port. +It only writes the bytes that fit in the aux buffer. +.RS +.PP +(since version 0.2.14) +The optional argument <format> indicates the string format. +On success it will report "X byte(s) written". +.PP +String formats: + * plain - plain string (default, old behavior) + * base64 - base64 encoded string +.RE .TP .B vm slot_bindings <instance_name> Show slot bindings. (since version 0.2.8\-RC1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/stable/hv_vm.c new/dynamips-0.2.14/stable/hv_vm.c --- old/dynamips-0.2.13/stable/hv_vm.c 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/stable/hv_vm.c 2014-09-23 20:59:26.000000000 +0200 @@ -301,6 +301,10 @@ vm->ram_size = atoi(argv[1]); + /* XXX npe-400 can split excess ram into iomem, adjusting ram_size */ + if (vm->elf_machine_id == C7200_ELF_MACHINE_ID) + VM_C7200(vm)->npe400_ram_size = vm->ram_size; + vm_release(vm); hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); return(0); @@ -856,31 +860,75 @@ /* Send a message on the console */ static int cmd_send_con_msg(hypervisor_conn_t *conn,int argc,char *argv[]) { - vm_instance_t *vm; + vm_instance_t *vm = NULL; + const char *format = NULL; + char *data = NULL; + int len,written; if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) return(-1); - vtty_store_str(vm->vtty_con,argv[1]); + format = (argc > 2)? argv[2]: "plain"; + len = (int)strlen(argv[1]); + written = -1; + + if (strcmp(format,"plain") == 0 && len >= 0) { + written = vtty_store_data(vm->vtty_con,argv[1],len); + } + else if (strcmp(format,"base64") == 0 && len >= 0) { + data = malloc(len+1); + len = base64_decode((unsigned char*)data,(const unsigned char *)argv[1],len); + written = vtty_store_data(vm->vtty_con,data,len); + free(data); + data = NULL; + } vm_release(vm); - hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); - return(0); + if (written < 0) { + hypervisor_send_reply(conn,HSC_ERR_INV_PARAM,1,"Invalid parameter"); + return(-1); + } + else { + hypervisor_send_reply(conn,HSC_INFO_OK,1,"%d byte(s) written",written); + return(0); + } } /* Send a message on the AUX port */ static int cmd_send_aux_msg(hypervisor_conn_t *conn,int argc,char *argv[]) { - vm_instance_t *vm; + vm_instance_t *vm = NULL; + const char *format = NULL; + char *data = NULL; + int len,written; if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) return(-1); - vtty_store_str(vm->vtty_aux,argv[1]); + format = (argc > 2)? argv[2]: "plain"; + len = (int)strlen(argv[1]); + written = -1; + + if (strcmp(format,"plain") == 0 && len >= 0) { + written = vtty_store_data(vm->vtty_aux,argv[1],len); + } + else if (strcmp(format,"base64") == 0 && len >= 0) { + data = malloc(len+1); + len = base64_decode((unsigned char*)data,(const unsigned char *)argv[1],len); + written = vtty_store_data(vm->vtty_aux,data,len); + free(data); + data = NULL; + } vm_release(vm); - hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); - return(0); + if (written < 0) { + hypervisor_send_reply(conn,HSC_ERR_INV_PARAM,1,"Invalid parameter"); + return(-1); + } + else { + hypervisor_send_reply(conn,HSC_INFO_OK,1,"%d byte(s) written",written); + return(0); + } } @@ -1237,8 +1285,8 @@ { "cpu_usage", 2, 2, cmd_show_cpu_usage, NULL }, { "suspend", 1, 1, cmd_suspend, NULL }, { "resume", 1, 1, cmd_resume, NULL }, - { "send_con_msg", 2, 2, cmd_send_con_msg, NULL }, - { "send_aux_msg", 2, 2, cmd_send_aux_msg, NULL }, + { "send_con_msg", 2, 3, cmd_send_con_msg, NULL }, + { "send_aux_msg", 2, 3, cmd_send_aux_msg, NULL }, { "slot_bindings", 1, 1, cmd_slot_bindings, NULL }, { "slot_nio_bindings", 2, 2, cmd_slot_nio_bindings, NULL }, { "slot_add_binding", 4, 4, cmd_slot_add_binding, NULL }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/unstable/CMakeLists.txt new/dynamips-0.2.14/unstable/CMakeLists.txt --- old/dynamips-0.2.13/unstable/CMakeLists.txt 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/unstable/CMakeLists.txt 2014-09-23 20:59:26.000000000 +0200 @@ -37,6 +37,8 @@ endif ( NOT BUILD_DYNAMIPS_UNSTABLE ) # dynamips_*_unstable +add_definitions( "-DUSE_UNSTABLE" ) + set ( _files "${COMMON}/mempool.c" "${COMMON}/registry.c" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dynamips-0.2.13/unstable/hv_vm.c new/dynamips-0.2.14/unstable/hv_vm.c --- old/dynamips-0.2.13/unstable/hv_vm.c 2014-07-10 17:49:35.000000000 +0200 +++ new/dynamips-0.2.14/unstable/hv_vm.c 2014-09-23 20:59:26.000000000 +0200 @@ -322,6 +322,10 @@ vm->ram_size = atoi(argv[1]); + /* XXX npe-400 can split excess ram into iomem, adjusting ram_size */ + if (vm->elf_machine_id == C7200_ELF_MACHINE_ID) + VM_C7200(vm)->npe400_ram_size = vm->ram_size; + vm_release(vm); hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); return(0); @@ -877,31 +881,75 @@ /* Send a message on the console */ static int cmd_send_con_msg(hypervisor_conn_t *conn,int argc,char *argv[]) { - vm_instance_t *vm; + vm_instance_t *vm = NULL; + const char *format = NULL; + char *data = NULL; + int len,written; if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) return(-1); - vtty_store_str(vm->vtty_con,argv[1]); + format = (argc > 2)? argv[2]: "plain"; + len = (int)strlen(argv[1]); + written = -1; + + if (strcmp(format,"plain") == 0 && len >= 0) { + written = vtty_store_data(vm->vtty_con,argv[1],len); + } + else if (strcmp(format,"base64") == 0 && len >= 0) { + data = malloc(len+1); + len = base64_decode((unsigned char*)data,(const unsigned char *)argv[1],len); + written = vtty_store_data(vm->vtty_con,data,len); + free(data); + data = NULL; + } vm_release(vm); - hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); - return(0); + if (written < 0) { + hypervisor_send_reply(conn,HSC_ERR_INV_PARAM,1,"Invalid parameter"); + return(-1); + } + else { + hypervisor_send_reply(conn,HSC_INFO_OK,1,"%d byte(s) written",written); + return(0); + } } /* Send a message on the AUX port */ static int cmd_send_aux_msg(hypervisor_conn_t *conn,int argc,char *argv[]) { - vm_instance_t *vm; + vm_instance_t *vm = NULL; + const char *format = NULL; + char *data = NULL; + int len,written; if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) return(-1); - vtty_store_str(vm->vtty_aux,argv[1]); + format = (argc > 2)? argv[2]: "plain"; + len = (int)strlen(argv[1]); + written = -1; + + if (strcmp(format,"plain") == 0 && len >= 0) { + written = vtty_store_data(vm->vtty_aux,argv[1],len); + } + else if (strcmp(format,"base64") == 0 && len >= 0) { + data = malloc(len+1); + len = base64_decode((unsigned char*)data,(const unsigned char *)argv[1],len); + written = vtty_store_data(vm->vtty_aux,data,len); + free(data); + data = NULL; + } vm_release(vm); - hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); - return(0); + if (written < 0) { + hypervisor_send_reply(conn,HSC_ERR_INV_PARAM,1,"Invalid parameter"); + return(-1); + } + else { + hypervisor_send_reply(conn,HSC_INFO_OK,1,"%d byte(s) written",written); + return(0); + } } @@ -1259,8 +1307,8 @@ { "cpu_usage", 2, 2, cmd_show_cpu_usage, NULL }, { "suspend", 1, 1, cmd_suspend, NULL }, { "resume", 1, 1, cmd_resume, NULL }, - { "send_con_msg", 2, 2, cmd_send_con_msg, NULL }, - { "send_aux_msg", 2, 2, cmd_send_aux_msg, NULL }, + { "send_con_msg", 2, 3, cmd_send_con_msg, NULL }, + { "send_aux_msg", 2, 3, cmd_send_aux_msg, NULL }, { "slot_bindings", 1, 1, cmd_slot_bindings, NULL }, { "slot_nio_bindings", 2, 2, cmd_slot_nio_bindings, NULL }, { "slot_add_binding", 4, 4, cmd_slot_add_binding, NULL }, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aegisub for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package aegisub for openSUSE:Factory checked in at 2014-09-26 10:52:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aegisub (Old) and /work/SRC/openSUSE:Factory/.aegisub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aegisub" Changes: -------- --- /work/SRC/openSUSE:Factory/aegisub/aegisub.changes 2014-09-08 21:30:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aegisub.new/aegisub.changes 2014-09-26 11:21:32.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 22 20:24:24 UTC 2014 - sfalken(a)opensuse.org + +- Updated to 3.2.1 + * Actually register the SSA file handler so that SSA files can be opened and exported + * Deduplicate Extradata entries created by Automation scripts + * Fix loading subtitles from Matroska files which have [Aegisub Extradata] sections + * Handle parsing errors when loading Shift Times history + * Add Ukrainian UI translation +- Added: + * aegisub-3.2.1.tar.xz +- Removed: + * aegisub-3.2.0.tar.xz + +------------------------------------------------------------------- Old: ---- aegisub-3.2.0.tar.xz New: ---- aegisub-3.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aegisub.spec ++++++ --- /var/tmp/diff_new_pack.sj32yh/_old 2014-09-26 11:21:32.000000000 +0200 +++ /var/tmp/diff_new_pack.sj32yh/_new 2014-09-26 11:21:32.000000000 +0200 @@ -19,7 +19,7 @@ %bcond_with ffms2 Name: aegisub -Version: 3.2.0 +Version: 3.2.1 Release: 0 Summary: Subtitle editor License: BSD-3-Clause ++++++ aegisub-3.2.0.tar.xz -> aegisub-3.2.1.tar.xz ++++++ ++++ 7056 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

commit lxpanel for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package lxpanel for openSUSE:Factory checked in at 2014-09-26 10:52:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxpanel (Old) and /work/SRC/openSUSE:Factory/.lxpanel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxpanel" Changes: -------- --- /work/SRC/openSUSE:Factory/lxpanel/lxpanel.changes 2014-08-25 11:05:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxpanel.new/lxpanel.changes 2014-09-26 11:21:30.000000000 +0200 @@ -1,0 +2,45 @@ +Mon Sep 22 12:46:40 UTC 2014 - trcs(a)gmx.com + +- New upstream version 0.7.1 + * Fixed search for the gtkrc file. + * Fixed search path for configuration - it should be not + compilation time path but paths using $XDG_CONFIG_DIRS. + * Fixed incorrect flag for 'launchbar' plugin which marks him + expandable. + * Fixed dragging of task buttons. + * Corrected using $XDG_MENU_PREFIX to work the same way as + libfm does. + * Fixed using font description, font in gtkrc file was ignored. + * Improved search for hw sensors in /sys/class/hwmon/ hierarchy. + * Improved check for critical temperatures in 'termal' plugin, + now each individual hardware setting (if available) is also + taken into consideration. + * Fixed parsing alias name in 'weather' plugin settings. + * Got rid of all individual plugins/*/Makefile - those rules + more easily can be contained in the plugins/Makefile.am. + Adding a simple plugin basically would mean to add three + lines into that file instead of writing whole Makefile.am. + * Fixed invalid system config path search ("lxpanel" part was + missing). + * Fixed incorrect requirements in the lxpanel.pc file. + * Fixed memory leak in the 'volumealsa' plugin. + * Now 'volumealsa' checks for 'MixerCommand' setting in the + configuration before guessing it. + * Fixed color saving in the configuration. + * Fixed incomplete resources deallocation in 'volumealsa' + plugin. + * Fixed make uninstall (it left plugins installed). + * Fixed monitor number set from GUI. + * Fixed hang on netstatus icon in auto-hidden panel. + * Fixed icon grid compilation with GTK+ < 2.20. + * Fixed compilation without menu-cache. + * Now man pages are included in the GIT and tarball, not just + xml files. + * Fixed incorrect printf arguments in 'netstatus' plugin. +- Removed + lxpanel-0.7.0-fix-crash-after-click-on-empty-part-of-panel.patch +- Added + lxpanel-0.7.1-fix-empty-panel-unhide-if-height_when_hidden-is-0.patch +- Added lxpanel-0.7.1-fix-panel-covering-maximized-windows.patch + +------------------------------------------------------------------- @@ -78 +123 @@ -Sun Jan 5 11:46:02 UTC 2014 - jcsl(a)eresmas.com +Sun Jan 5 11:46:02 UTC 2014 - trcs(a)eresmas.com Old: ---- lxpanel-0.7.0-fix-crash-after-click-on-empty-part-of-panel.patch lxpanel-0.7.0.tar.xz New: ---- lxpanel-0.7.1-fix-empty-panel-unhide-if-height_when_hidden-is-0.patch lxpanel-0.7.1-fix-panel-covering-maximized-windows.patch lxpanel-0.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxpanel.spec ++++++ --- /var/tmp/diff_new_pack.sR1yIH/_old 2014-09-26 11:21:31.000000000 +0200 +++ /var/tmp/diff_new_pack.sR1yIH/_new 2014-09-26 11:21:31.000000000 +0200 @@ -17,20 +17,20 @@ Name: lxpanel -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Lightweight X11 desktop panel based on fbpanel License: GPL-2.0 Group: System/GUI/LXDE Url: http://www.lxde.org/ Source0: %{name}-%{version}.tar.xz -# http://git.lxde.org/gitweb/?p=lxde/lxpanel.git;a=commit;h=d4943c80cded63252… -# Makes LXPanel not to crash when it's clicked on an empty part -Patch0: lxpanel-0.7.0-fix-crash-after-click-on-empty-part-of-panel.patch +# http://git.lxde.org/gitweb/?p=lxde/lxpanel.git;a=commit;h=9a762e63dce20d425… +Patch0: lxpanel-0.7.1-fix-empty-panel-unhide-if-height_when_hidden-is-0.patch +# http://git.lxde.org/gitweb/?p=lxde/lxpanel.git;a=commit;h=0bfcc6c97fca70de5… +Patch1: lxpanel-0.7.1-fix-panel-covering-maximized-windows.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libiw-devel -BuildRequires: libtool BuildRequires: libfm-gtk-devel BuildRequires: libxml2-devel BuildRequires: pkg-config @@ -41,13 +41,13 @@ BuildRequires: pkgconfig(libmenu-cache) BuildRequires: pkgconfig(libwnck-1.0) Requires: menu-cache +Requires: lxmenu-data Recommends: %{name}-lang Provides: %{name}-plugins >= %{version} Obsoletes: %{name}-plugins < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %lang_package - %description LXPanel is a lightweight X11 desktop panel containing: 1. User-friendly application menu automatically generated from *.desktop files on the system @@ -62,7 +62,6 @@ For example, "lxpanelctl run" will show the Run dialog in lxpanel, and "lxpanelctl menu" will show the application menu. This is useful in key bindings provided by window managers. - %package devel Summary: Devel files for %{name} Group: Development/Libraries/C and C++ @@ -70,29 +69,23 @@ Requires: glib2-devel Requires: menu-cache-devel - %description devel Headers and development %{name} files. - %prep %setup -q %patch0 -p1 - +%patch1 -p1 %build -%configure \ - --enable-man \ - --with-plugins=all +%configure --with-plugins=all make %{?_smp_mflags} V=1 - %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%makeinstall %{?_smp_mflags} %find_lang %{name} %fdupes -s %{buildroot} - %files %defattr(-,root,root,0755) %doc ChangeLog README COPYING @@ -125,8 +118,7 @@ %{_libdir}/%{name}/plugins/monitors.so %{_libdir}/%{name}/plugins/netstat.so %{_libdir}/%{name}/plugins/weather.so -%{_sysconfdir}/xdg/%{name}/* - +%config(noreplace) %{_sysconfdir}/xdg/%{name}/* %files devel %defattr(-,root,root) @@ -134,9 +126,7 @@ %{_includedir}/%{name}/*.h %{_libdir}/pkgconfig/%{name}.pc - %files lang -f %{name}.lang %defattr(-,root,root) - %changelog ++++++ lxpanel-0.7.1-fix-empty-panel-unhide-if-height_when_hidden-is-0.patch ++++++ >From 9a762e63dce20d425345947b7ad4f24ec510db27 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <andrej(a)rep.kiev.ua> Date: Tue, 23 Sep 2014 13:02:09 +0300 Subject: [PATCH] Fix unhiding panel if it becomes empty and height_when_hidden is 0. gtk_widget_show() does not work because it is an empty container ATM. Therefore gtk_widget_queue_resize() should be used as well. --- ChangeLog | 4 ++++ src/panel.c | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bb099a..fcf7c27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +* Fixed unhiding panel if it becomes empty and height_when_hidden is 0. + +0.7.1 +------------------------------------------------------------------------- * Fixed search for the gtkrc file. * Fixed search path for configuration - it should be not compilation time path but paths using $XDG_CONFIG_DIRS. diff --git a/src/panel.c b/src/panel.c index 57488b3..ee61197 100644 --- a/src/panel.c +++ b/src/panel.c @@ -691,11 +691,13 @@ mouse_watch(LXPanel *panel) gint cx, cy, cw, ch, gap; - cx = p->cx; - cy = p->cy; + cx = p->ax; + cy = p->ay; cw = p->cw; ch = p->ch; + if (cw == 1) cw = 0; + if (ch == 1) ch = 0; /* reduce area which will raise panel so it does not interfere with apps */ if (p->ah_state == AH_STATE_HIDDEN) { gap = MAX(p->height_when_hidden, GAP); @@ -743,10 +745,13 @@ static void ah_state_set(LXPanel *panel, PanelAHState ah_state) case AH_STATE_VISIBLE: gtk_widget_show(GTK_WIDGET(panel)); gtk_widget_show(p->box); + gtk_widget_queue_resize(GTK_WIDGET(panel)); gtk_window_stick(GTK_WINDOW(panel)); p->visible = TRUE; break; case AH_STATE_WAITING: + if (p->hide_timeout) + g_source_remove(p->hide_timeout); p->hide_timeout = g_timeout_add(2 * PERIOD, ah_state_hide_timeout, panel); break; case AH_STATE_HIDDEN: -- 1.7.10.4 ++++++ lxpanel-0.7.1-fix-panel-covering-maximized-windows.patch ++++++ >From 0bfcc6c97fca70de51acf06396578ddd7f03e9b1 Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko <andrej(a)rep.kiev.ua> Date: Wed, 24 Sep 2014 16:51:08 +0300 Subject: [PATCH] [SF#679]X11 library uses unsigned long as cardinal-32 data, not uint32_t. That lead to invalid strut setting after 5cc945e412002531bb349a0443c837393ce57c43 And it might lead to other bugs on 64-bit architectures as well, may be just not reported yet or not reproduced yet. --- plugins/launchtaskbar.c | 2 +- src/ev.c | 4 ++-- src/misc.c | 10 +++++----- src/panel.c | 12 ++++++------ src/private.h | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/launchtaskbar.c b/plugins/launchtaskbar.c index 804c6e5..89c9a0b 100644 --- a/plugins/launchtaskbar.c +++ b/plugins/launchtaskbar.c @@ -2690,7 +2690,7 @@ static void taskbar_button_size_allocate(GtkWidget * btn, GtkAllocation * alloc, /* Send a NET_WM_ICON_GEOMETRY property change on the window. */ - guint32 data[4]; + gulong data[4]; data[0] = x; data[1] = y; data[2] = alloc->width; diff --git a/src/ev.c b/src/ev.c index e4dd66e..bf47fe0 100644 --- a/src/ev.c +++ b/src/ev.c @@ -290,7 +290,7 @@ fb_ev_current_desktop(FbEv *ev) { ENTER; if (ev->current_desktop == -1) { - guint32 *data; + gulong *data; data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_CURRENT_DESKTOP, XA_CARDINAL, 0); if (data) { @@ -307,7 +307,7 @@ fb_ev_number_of_desktops(FbEv *ev) { ENTER; if (ev->number_of_desktops == -1) { - guint32 *data; + gulong *data; data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_NUMBER_OF_DESKTOPS, XA_CARDINAL, 0); if (data) { diff --git a/src/misc.c b/src/misc.c index fb16893..f15961b 100644 --- a/src/misc.c +++ b/src/misc.c @@ -542,7 +542,7 @@ get_xaproperty (Window win, Atom prop, Atom type, int *nitems) ENTER; prop_data = NULL; - if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), win, prop, 0, 0x7fffffff, False, + if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), win, prop, 0, G_MAXLONG, False, type, &type_ret, &format_ret, &items_ret, &after_ret, &prop_data) != Success) { @@ -612,7 +612,7 @@ int get_net_number_of_desktops() { int desknum; - guint32 *data; + gulong *data; ENTER; data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_NUMBER_OF_DESKTOPS, @@ -630,7 +630,7 @@ int get_net_current_desktop () { int desk; - guint32 *data; + gulong *data; ENTER; data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_CURRENT_DESKTOP, XA_CARDINAL, 0); @@ -646,7 +646,7 @@ int get_net_wm_desktop(Window win) { int desk = 0; - guint32 *data; + gulong *data; ENTER; data = get_xaproperty (win, a_NET_WM_DESKTOP, XA_CARDINAL, 0); @@ -661,7 +661,7 @@ GPid get_net_wm_pid(Window win) { GPid pid = 0; - guint32 *data; + gulong *data; ENTER; data = get_xaproperty (win, a_NET_WM_PID, XA_CARDINAL, 0); diff --git a/src/panel.c b/src/panel.c index ee61197..b13a850 100644 --- a/src/panel.c +++ b/src/panel.c @@ -73,7 +73,7 @@ static void lxpanel_finalize(GObject *object) lxpanel_config_save( self ); config_destroy(p->config); - g_free(p->workarea); + XFree(p->workarea); g_free( p->background_file ); g_slist_free( p->system_menus ); @@ -380,7 +380,7 @@ void _panel_set_wm_strut(LXPanel *panel) strut_size = p->height_when_hidden; /* Set up strut value in property format. */ - guint32 desired_strut[12]; + gulong desired_strut[12]; memset(desired_strut, 0, sizeof(desired_strut)); if (p->setstrut) { @@ -541,7 +541,7 @@ panel_event_filter(GdkXEvent *xevent, GdkEvent *event, gpointer not_used) for( l = all_panels; l; l = l->next ) { LXPanel* p = (LXPanel*)l->data; - g_free( p->priv->workarea ); + XFree( p->priv->workarea ); p->priv->workarea = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_WORKAREA, XA_CARDINAL, &p->priv->wa_len); /* print_wmdata(p); */ } @@ -1225,7 +1225,7 @@ panel_start_gui(LXPanel *panel) { Atom state[3]; XWMHints wmhints; - guint32 val; + gulong val; Display *xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); Panel *p = panel->priv; GtkWidget *w = GTK_WIDGET(panel); @@ -1284,9 +1284,9 @@ panel_start_gui(LXPanel *panel) _panel_establish_autohide(panel); /* send it to running wm */ - Xclimsg(p->topxwin, a_NET_WM_DESKTOP, 0xFFFFFFFF, 0, 0, 0, 0); + Xclimsg(p->topxwin, a_NET_WM_DESKTOP, G_MAXULONG, 0, 0, 0, 0); /* and assign it ourself just for case when wm is not running */ - val = 0xFFFFFFFF; + val = G_MAXULONG; XChangeProperty(xdisplay, p->topxwin, a_NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1); diff --git a/src/private.h b/src/private.h index 52f398d..fb909e3 100644 --- a/src/private.h +++ b/src/private.h @@ -113,7 +113,7 @@ struct _Panel { int desknum; int curdesk; - guint32 *workarea; + gulong *workarea; int wa_len; char* background_file; -- 1.7.10.4 ++++++ lxpanel-0.7.0.tar.xz -> lxpanel-0.7.1.tar.xz ++++++ ++++ 31543 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

commit x3270 for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package x3270 for openSUSE:Factory checked in at 2014-09-26 10:52:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/x3270 (Old) and /work/SRC/openSUSE:Factory/.x3270.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "x3270" Changes: -------- --- /work/SRC/openSUSE:Factory/x3270/x3270.changes 2014-09-22 09:21:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.x3270.new/x3270.changes 2014-09-26 11:21:29.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 24 11:03:06 UTC 2014 - tchvatal(a)suse.com + +- Version bump to 3.3.14 and update x026 to 1.2: + * For full change list read: + http://x3270.bgp.nu/documentation-relnotes.html +- Remove suse readme which is totally pointless +- Clean spec with spec-cleaner +- Remove unused patch gcc4.diff + +------------------------------------------------------------------- Old: ---- README.SUSE gcc4.diff suite3270-3.3.12ga13-src.tgz x026-1.0.tgz New: ---- suite3270-3.3.14ga11-src.tgz x026-1.2.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x3270.spec ++++++ --- /var/tmp/diff_new_pack.fKz061/_old 2014-09-26 11:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.fKz061/_new 2014-09-26 11:21:30.000000000 +0200 @@ -16,10 +16,22 @@ # -%define appdefdir %{_datadir}/X11 - +%define _suffix ga11 +%define _fullname suite3270-%{version}%{_suffix} +%define _x026ver 1.2 Name: x3270 -BuildRequires: autoconf +Version: 3.3.14 +Release: 0 +Summary: A Family of IBM 3270 Terminal Emulators +License: MIT +Group: System/X11/Terminals +Url: http://x3270.bgp.nu +Source0: http://download.sourceforge.net/%{name}/%{_fullname}-src.tgz +Source1: http://download.sourceforge.net/%{name}/x026-%{_x026ver}.tgz +Patch0: mknod.patch +Patch100: usr_local_bin.patch +Patch102: x026-offset.diff +Patch104: pr3270-memleak.patch BuildRequires: bdftopcf BuildRequires: fdupes BuildRequires: fontpackages-devel @@ -29,20 +41,6 @@ BuildRequires: tcl-devel BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel -Version: 3.3.12 -Release: 0 -Summary: A Family of IBM 3270 Terminal Emulators -License: MIT -Group: System/X11/Terminals -Url: http://x3270.bgp.nu -Source0: suite3270-3.3.12ga13-src.tgz -Source5: README.SUSE -Source6: http://x3270.bgp.nu/download/x026-1.0.tgz -Patch: mknod.patch -Patch100: usr_local_bin.patch -Patch102: x026-offset.diff -Patch104: pr3270-memleak.patch -Patch105: gcc4.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -91,32 +89,27 @@ # will also hold the common config.cache # -q uietly -c reate -name all3270 # -a fter changing into all3270, expand sources -%setup -q -c -n all3270 -T -a0 -a6 -%patch +%setup -q -c -n all3270 -T -a0 -a1 +%patch0 %patch100 %patch102 %patch104 -%patch105 %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" export LIBX3270DIR=%{_sysconfdir}/x3270 # the tcl variant cd tcl3270-3.3 - autoconf %configure \ --cache-file=../config.cache \ - --with-tcl=%tcl_version \ --enable-ssl - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the X variant cd x3270-3.3 - # pr3287 is built from the separate source pr3287*.tgz above. %configure \ --cache-file=../config.cache \ --enable-app-defaults \ - --without-pr3287 \ --x-includes=%{_includedir} \ --x-libraries=%{_libdir} \ --with-all-xinstall \ @@ -124,40 +117,37 @@ --enable-ssl xmkmf -a make depend - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the console variant cd c3270-3.3 %configure \ --cache-file=../config.cache \ - --without-pr3287 \ --enable-ssl - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the scripting variant cd s3270-3.3 %configure \ --cache-file=../config.cache \ --enable-ssl - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the printer cd pr3287-3.3 %configure \ --cache-file=../config.cache \ --enable-ssl - make LIBX3270DIR=${LIBX3270DIR} + make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} cd .. # the IBM 026 keypunch emulator -cd x026-1.0 +cd x026-%{_x026ver} xmkmf - make x026 + make %{?_smp_mflags} cd .. %install export LIBX3270DIR=%{_sysconfdir}/x3270 -# abort on error -set -e # create the default directory structure in the build root mkdir --parents %{buildroot}{%{_bindir},%{_mandir}/{man1,man5}} # the X variant @@ -169,9 +159,9 @@ # want in the package. remove that: rm %{buildroot}%{_miscfontsdir}/fonts.dir install -d -m 755 \ - %{buildroot}%{appdefdir}/app-defaults + %{buildroot}%{_datadir}/X11/app-defaults install -m 644 X3270.xad \ - %{buildroot}%{appdefdir}/app-defaults/X3270 + %{buildroot}%{_datadir}/X11/app-defaults/X3270 # clean up: # remove remainders of patching the examples, if existing rm -v Examples/*.orig || true @@ -197,34 +187,34 @@ make DESTDIR=%{buildroot} LIBX3270DIR=${LIBX3270DIR} install.man cd .. # the IBM 026 keypunch emulator -cd x026-1.0 - make DESTDIR=%{buildroot} install +cd x026-%{_x026ver} +make DESTDIR=%{buildroot} install install.man cd .. # move site config files to the standard locations -mkdir -p %{buildroot}/usr/lib/x3270 +mkdir -p %{buildroot}%{_libexecdir}/x3270 # this is a per-site, not a per-machine config file chmod 644 %{buildroot}%{_sysconfdir}/x3270/ibm_hosts -cp -a %{S:5} . -# remove man-pages in /usr/man -rm -rf %{buildroot}/usr/man/man{1,5} # set permissions correct chmod ugo-x %{buildroot}%{_mandir}/man{1,5}/* # copy the docs -mkdir -p %{buildroot}%{_docdir}/%name -cp -pr --parents x3270-3.3/{Examples,html,Playback} %{buildroot}%{_docdir}/%name -cp -pr --parents c3270-3.3/html %{buildroot}%{_docdir}/%name -cp -pr --parents pr3287-3.3/html %{buildroot}%{_docdir}/%name -cp -pr --parents s3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name -cp -pr --parents tcl3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%name +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -pr --parents Playback %{buildroot}%{_docdir}/%{name} +cp -pr --parents x3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name} +cp -pr --parents c3270-3.3/html %{buildroot}%{_docdir}/%{name} +cp -pr --parents pr3287-3.3/html %{buildroot}%{_docdir}/%{name} +cp -pr --parents s3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name} +cp -pr --parents tcl3270-3.3/{Examples,html} %{buildroot}%{_docdir}/%{name} # create symlinks in documentation %fdupes -s %{buildroot}/%{_docdir} -%reconfigure_fonts_scriptlets +%{reconfigure_fonts_scriptlets} %files %defattr(-,root,root,755) # common files %dir %{_sysconfdir}/x3270 +%dir %{_docdir}/%{name} +%dir %{_docdir}/%{name}/* %config(noreplace) %{_sysconfdir}/x3270/ibm_hosts %doc %{_mandir}/man5/ibm_hosts.5.gz %doc %{_mandir}/man1/x3270if.1.gz @@ -232,33 +222,33 @@ %{_bindir}/x3270if # x3270 %{_bindir}/x3270 -%{appdefdir}/app-defaults/X3270 +%{_datadir}/X11/app-defaults/X3270 %dir %{_miscfontsdir} %{_miscfontsdir}/* %doc %{_mandir}/man1/x3270.1x.gz -%doc %{_docdir}/%name/x3270-3.3/Examples -%doc %{_docdir}/%name/x3270-3.3/html -%doc %{_docdir}/%name/x3270-3.3/Playback +%doc %{_docdir}/%{name}/x3270-3.3/Examples +%doc %{_docdir}/%{name}/x3270-3.3/html +%doc %{_docdir}/%{name}/Playback # c3270 %{_bindir}/c3270 %doc %{_mandir}/man1/c3270.1.gz -%doc %{_docdir}/%name/c3270-3.3/html +%doc %{_docdir}/%{name}/c3270-3.3/html # pr3287 %{_bindir}/pr3287 %doc %{_mandir}/man1/pr3287.1.gz -%doc %{_docdir}/%name/pr3287-3.3/html +%doc %{_docdir}/%{name}/pr3287-3.3/html # s3270 %{_bindir}/s3270 %doc %{_mandir}/man1/s3270.1.gz -%doc %{_docdir}/%name/s3270-3.3/Examples -%doc %{_docdir}/%name/s3270-3.3/html +%doc %{_docdir}/%{name}/s3270-3.3/Examples +%doc %{_docdir}/%{name}/s3270-3.3/html # tcl3270 %{_bindir}/tcl3270 %doc %{_mandir}/man1/tcl3270.1.gz -%doc %{_docdir}/%name/tcl3270-3.3/Examples -%doc %{_docdir}/%name/tcl3270-3.3/html +%doc %{_docdir}/%{name}/tcl3270-3.3/Examples +%doc %{_docdir}/%{name}/tcl3270-3.3/html # x026 %{_bindir}/x026 -%doc README.SUSE +%doc %{_mandir}/man1/x026.1x.gz %changelog ++++++ suite3270-3.3.12ga13-src.tgz -> suite3270-3.3.14ga11-src.tgz ++++++ /work/SRC/openSUSE:Factory/x3270/suite3270-3.3.12ga13-src.tgz /work/SRC/openSUSE:Factory/.x3270.new/suite3270-3.3.14ga11-src.tgz differ: char 5, line 1 ++++++ x026-1.0.tgz -> x026-1.2.tgz ++++++ ++++ 3061 lines of diff (skipped) ++++++ x026-offset.diff ++++++ --- /var/tmp/diff_new_pack.fKz061/_old 2014-09-26 11:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.fKz061/_new 2014-09-26 11:21:30.000000000 +0200 @@ -1,10 +1,12 @@ ---- x026-1.0/x026.c.orig 2003-07-29 10:03:36.000000000 +0200 -+++ x026-1.0/x026.c 2003-07-29 10:41:43.000000000 +0200 -@@ -114,32 +114,32 @@ +diff -urN x026-1.2/x026.c.old x026-1.2/x026.c +--- x026-1.2/x026.c.old 2014-09-24 11:58:03.376699486 +0200 ++++ x026-1.2/x026.c 2014-09-24 12:06:35.460699425 +0200 +@@ -419,34 +419,34 @@ }; /* Xt actions. */ -static void data(Widget, XEvent *, String *, Cardinal *); +-static void multi_punch_data(Widget, XEvent *, String *, Cardinal *); -static void delete_window(Widget, XEvent *, String *, Cardinal *); -static void home(Widget, XEvent *, String *, Cardinal *); -static void left(Widget, XEvent *, String *, Cardinal *); @@ -15,6 +17,7 @@ -static void insert_selection(Widget, XEvent *, String *, Cardinal *); -static void confirm(Widget, XEvent *, String *, Cardinal *); +static void x026_data(Widget, XEvent *, String *, Cardinal *); ++static void x026_multi_punch_data(Widget, XEvent *, String *, Cardinal *); +static void x026_delete_window(Widget, XEvent *, String *, Cardinal *); +static void x026_home(Widget, XEvent *, String *, Cardinal *); +static void x026_left(Widget, XEvent *, String *, Cardinal *); @@ -32,6 +35,7 @@ /* Actions. */ XtActionsRec actions[] = { - { "Data", data }, +- { "MultiPunchData", multi_punch_data }, - { "DeleteWindow", delete_window }, - { "Home", home }, - { "Left", left }, @@ -42,6 +46,7 @@ - { "insert-selection", insert_selection }, - { "confirm", confirm } + { "Data", x026_data }, ++ { "MultiPunchData", x026_multi_punch_data }, + { "DeleteWindow", x026_delete_window }, + { "Home", x026_home }, + { "Left", x026_left }, @@ -54,7 +59,7 @@ }; int actioncount = XtNumber(actions); -@@ -389,7 +389,7 @@ +@@ -788,7 +788,7 @@ XtNborderWidth, BUTTON_BW, XtNborderColor, appres.background, NULL); @@ -63,7 +68,7 @@ /* Create graphics contexts for drawing. */ xgcv.foreground = appres.foreground; -@@ -575,7 +575,7 @@ +@@ -955,7 +955,7 @@ /* Redraw the entire card image. */ static void @@ -72,7 +77,7 @@ { int i; Dimension x, y, w, h; -@@ -641,7 +641,7 @@ +@@ -1027,7 +1027,7 @@ /* Exit. */ static void @@ -81,7 +86,7 @@ { exit(0); } -@@ -696,6 +696,7 @@ +@@ -1082,6 +1082,7 @@ #if defined(SOUND) /*[*/ loud_click(); #endif /*]*/ @@ -89,7 +94,7 @@ } } -@@ -841,7 +842,7 @@ +@@ -1222,7 +1223,7 @@ */ static void @@ -98,7 +103,16 @@ { XKeyEvent *kevent = (XKeyEvent *)event; char buf[10]; -@@ -858,19 +859,19 @@ +@@ -1236,7 +1237,7 @@ + } + + static void +-multi_punch_data(Widget wid, XEvent *event, String *params, Cardinal *num_params) ++x026_multi_punch_data(Widget wid, XEvent *event, String *params, Cardinal *num_params) + { + XKeyEvent *kevent = (XKeyEvent *)event; + char buf[10]; +@@ -1250,19 +1251,19 @@ } static void @@ -121,7 +135,7 @@ { int i; -@@ -882,7 +883,7 @@ +@@ -1274,7 +1275,7 @@ } static void @@ -130,7 +144,7 @@ { if (ccard->next) { ccard = ccard->next; -@@ -892,7 +893,7 @@ +@@ -1284,7 +1285,7 @@ } static void @@ -139,7 +153,7 @@ { int i; -@@ -905,7 +906,7 @@ +@@ -1297,7 +1298,7 @@ /* Throw away this card. */ static void @@ -148,7 +162,7 @@ { int i; -@@ -993,7 +994,7 @@ +@@ -1386,7 +1387,7 @@ } static void @@ -157,12 +171,12 @@ { int i; Atom a; -@@ -1115,7 +1116,7 @@ +@@ -1562,7 +1563,7 @@ } static void -confirm(Widget w, XEvent *event, String *params, Cardinal *num_params) +x026_confirm(Widget w, XEvent *event, String *params, Cardinal *num_params) { - save_file(); + save_file_ascii(); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lynis for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package lynis for openSUSE:Factory checked in at 2014-09-26 10:52:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lynis (Old) and /work/SRC/openSUSE:Factory/.lynis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lynis" Changes: -------- --- /work/SRC/openSUSE:Factory/lynis/lynis.changes 2014-01-23 15:49:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lynis.new/lynis.changes 2014-09-26 11:21:28.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 24 16:36:21 UTC 2014 - citypw(a)gmail.com + +- Upgrade to version 1.6.2 +- Remove files: + * lynis_1.3.7_include-test-filesystem.diff( already fixed) + * lynis-1.3.9.tar.gz + +------------------------------------------------------------------- Old: ---- lynis-1.3.9.tar.gz lynis_1.3.7_include-test-filesystem.diff New: ---- lynis-1.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lynis.spec ++++++ --- /var/tmp/diff_new_pack.H3hLRY/_old 2014-09-26 11:21:28.000000000 +0200 +++ /var/tmp/diff_new_pack.H3hLRY/_new 2014-09-26 11:21:28.000000000 +0200 @@ -26,7 +26,7 @@ %define _bindir /usr/bin Name: lynis -Version: 1.3.9 +Version: 1.6.2 Release: 1 Summary: Security and System auditing tool License: GPL-3.0 @@ -50,7 +50,6 @@ # PATCH-OPENSUSE-FIX -- thomas(a)novell.com - modifying for openSUSE Patch2: %{name}_1.3.1_include_consts.diff Patch5: %{name}_1.3.6_include-osdetection.diff -Patch6: %{name}_1.3.7_include-test-filesystem.diff BuildRequires: gcc-c++ BuildRequires: libxml2-devel PreReq: %fillup_prereq @@ -76,11 +75,10 @@ See http://www.rootkit.nl for a full description and documentation. %prep -%setup -q +%setup -q -n %{name} %patch0 %patch2 %patch5 -%patch6 %build @@ -122,7 +120,7 @@ # pacify rpmlint #rm %{buildroot}%{_includedir}/tests_filesystems.orig -rm %{buildroot}%{_includedir}/osdetection.orig +#rm %{buildroot}%{_includedir}/osdetection.orig chmod +x %{buildroot}%{_pluginsdir}/custom_plugin.template %files ++++++ lynis-1.3.9.tar.gz -> lynis-1.6.2.tar.gz ++++++ ++++ 14806 lines of diff (skipped) ++++++ lynis_1.3.1_include_consts.diff ++++++ --- /var/tmp/diff_new_pack.H3hLRY/_old 2014-09-26 11:21:29.000000000 +0200 +++ /var/tmp/diff_new_pack.H3hLRY/_new 2014-09-26 11:21:29.000000000 +0200 @@ -2,11 +2,11 @@ =================================================================== --- include/consts.orig +++ include/consts -@@ -68,6 +68,7 @@ BINPATHS="/bin /sbin /usr/bin /usr/sbin +@@ -71,6 +71,7 @@ unset LANG CHKROOTKITBINARY="" CHKCONFIGBINARY="" FILEVALUE="" + FILE_NUM_TOTAL=0 FIND="" + FOUNDPATH=0 GRPCKBINARY="" - IPTABLESBINARY="" ++++++ lynis_1.3.5_lynis.diff ++++++ --- /var/tmp/diff_new_pack.H3hLRY/_old 2014-09-26 11:21:29.000000000 +0200 +++ /var/tmp/diff_new_pack.H3hLRY/_new 2014-09-26 11:21:29.000000000 +0200 @@ -2,15 +2,14 @@ =================================================================== --- lynis.orig +++ lynis -@@ -512,7 +512,10 @@ +@@ -716,7 +716,9 @@ webservers ssh snmp databases ldap php squid logging \ insecure_services banners scheduling accounting \ - time crypto virtualization mac_frameworks file_integrity hardening_tools \ + time crypto virtualization mac_frameworks file_integrity hardening_tools tooling \ - malware file_permissions homedirs kernel_hardening hardening" + malware file_permissions file_permissionsDB homedirs kernel_hardening hardening \ -+ system_dbus users_wo_password binary_rpath tmp_symlinks file_permissions_ww \ -+ system_proc network_allowed_ports" -+ ++ system_dbus users_wo_password binary_rpath tmp_symlinks file_permissions_ww \ ++ system_proc network_allowed_ports" else INCLUDE_TESTS="${TESTS_CATEGORY_TO_PERFORM}" logtext "Info: only performing tests from categories: ${TESTS_CATEGORY_TO_PERFORM}" ++++++ lynis_1.3.6_include-osdetection.diff ++++++ --- /var/tmp/diff_new_pack.H3hLRY/_old 2014-09-26 11:21:29.000000000 +0200 +++ /var/tmp/diff_new_pack.H3hLRY/_new 2014-09-26 11:21:29.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- include/osdetection.orig +++ include/osdetection -@@ -242,7 +242,7 @@ +@@ -303,7 +303,7 @@ OS_NAME="${LINUX_VERSION}" fi # If Linux version (full name) is unknown, use uname value -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit meld for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2014-09-26 10:52:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2014-07-21 10:35:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2014-09-26 11:21:27.000000000 +0200 @@ -1,0 +2,114 @@ +Sat Sep 20 12:18:43 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 3.11.4: + + Fixes: + - Only apply the auto merge flag to the last comparison + started. + - Fix install layout issues on Debian-based systems. + - Fix "Open External" for files on Windows. + - Record installation directory and executable location on + Windows. + - Revert to using latin1 as a fallback encoding; this will be + reverted in the next unstable series. + + Updated translations. + +------------------------------------------------------------------- +Sat Aug 23 11:05:09 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 3.11.3: + + Features: + - Manually handle app menu fallback for non-Gnome shells. + - Save and restore window maximisation state. + + Fixes: + - Add missing/incomplete "Language" entries. + - Miscellaneous code cleanups. + - Handle broken locale settings better. + - Fix size allocation issues in preferences UI. + - Update shebang for environments with Python 3 as default. + + Updated translations. + +------------------------------------------------------------------- +Sun Jul 20 13:56:48 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 3.11.2: + + Features: + - File and folder comparison panes can now be resized. + - Folder comparisons now support scrolling between chunks using + the mouse wheel in the link map, like file comparisons. + + Fixes: + - Don't draw spurious actions for equal chunks. + - Remove default sourceview behaviour for Alt+Left/Right. + - Fix storing translated column names in configuration. + - Several fixes for multiple windows in single-instance + handling: + . Resolve relative paths relative to the correct instance. + . Don't create windows in the original instance when the + calling instance errors out. + . Raise the correct window for new windows in the same + instance. + . Exit correctly for command line errors in the calling + instance. + - Fix display of unicode paths in repositories. + - Fix handling of unicode paths in recent files store. + - Improve behaviour of Open External action, and handle spaces + in filenames for the custom editor option. + - Improve support custom installation prefixes. +- Changes from version 3.11.1: + + Features: + - New (alpha) infrastructure for stand-alone Windows builds. + - Display renames and metadata in Bazaar repositories. + - Improved tab labels in version control comparisons. + - New merge-order preference to accompany comparison-order. + - Added a prompt to mark a conflict as resolved from file + comparison. + + Fixes: + - Fix filtering for shallow folder comparisons. + - Several install and distribution fixes. + - Sundry bug fixes. + + Updated translations. +- Pass --no-update-icon-cache --no-compile-schemas to the distutils + script. + +------------------------------------------------------------------- +Sun Jul 20 10:49:29 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 3.11.0: + + Features: + - Supporting hiding empty filtered folders in folder + comparison. + - Notify user when files change externally in file comparison. + - Use standard GIO file trash handling when deleting files. + - Newly written Mallard-based help. + + User interface updates: + - Support GNOME 3-style application menu. + - Visual improvements to several icons. + - Update Meld's colour scheme. + - Many visual styling updates, layout tweaks and UI polish. + + Internal changes: + - Port to GObject introspection, GTK+ 3, GApplication, + GSettings and other new things starting with 'G'. + - Port to distutils, based on python-distutils-extra. + - Move to using CSS for styling and colour definitions. + - Update to use more modern GTK widgets. + - Move a lot of extra UI construction into glade/UI files. + - Make several custom icons themeable. + - Make Meld a single-instance application, and add support for + multiple windows. + + Fixes: + - Improved rendering speed in file comparisons. + - Copy and paste within a buffer no longer causes occasional + incorrect change highlighting. + - Fixes for version control support. + - Windows crash fixes. + - Sundry bug fixes. + + Updated translations. +- Drop meld-1.3.0-env.patch: no longer required. +- Add meld-nodocs.patch: do not install COPYING and NEWS: we do + this on our own. +- Drop scrollkeeper BuildRequires: no longer needed. +- Add glib2-devel, gobject-introspection-devel, itstool and + libxml2-tools BuildRequires: new requirements. +- Rewrite build and install section to match new upstream build + system, based on distutils. + +------------------------------------------------------------------- Old: ---- meld-1.3.0-env.patch meld-1.8.6.tar.xz New: ---- meld-3.11.4.tar.xz meld-nodocs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.Ob5TsS/_old 2014-09-26 11:21:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Ob5TsS/_new 2014-09-26 11:21:27.000000000 +0200 @@ -17,29 +17,30 @@ Name: meld -Version: 1.8.6 +Version: 3.11.4 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ Group: Development/Tools/Other Url: http://meld.sourceforge.net/ -Source: http://download.gnome.org/sources/meld/1.8/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch prusnak(a)suse.cz -- don't use env -Patch1: %{name}-1.3.0-env.patch +Source: http://download.gnome.org/sources/meld/3.11/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE meld-nodocs.patch dimstar(a)opensuse.org -- We do not want COPYING and NEWS installed like this +Patch0: meld-nodocs.patch BuildRequires: fdupes +# Needed for glib2_gsettings_schema macros +BuildRequires: glib2-devel +# Needed for typelib() Requires +BuildRequires: gobject-introspection-devel # Needed for highcolor macros BuildRequires: hicolor-icon-theme BuildRequires: intltool +BuildRequires: itstool +BuildRequires: libxml2-tools BuildRequires: python -BuildRequires: scrollkeeper # Needed for shared-mime-info macros BuildRequires: shared-mime-info BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -%if 0%{?suse_version} <= 1210 -# Only needed for openSUSE <= 12.1; later it is pulled in by rpm-build. -BuildRequires: xz -%endif # needed for VCS diffs Requires: patch Requires: python-gconf @@ -70,16 +71,17 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream -%patch1 %build -make prefix=%{_prefix} libdir=%{_datadir} +python setup.py build %install -make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_datadir} install -# Remove scrollkeeper files -rm -rf %{buildroot}%{_prefix}%{_localstatedir}/lib/scrollkeeper +python setup.py \ + --no-update-icon-cache \ + --no-compile-schemas \ + install --root %{buildroot} --prefix %{_prefix} %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file meld IDE %fdupes %{buildroot}%{_datadir} @@ -89,12 +91,14 @@ %post %desktop_database_post +%glib2_gsettings_schema_post %icon_theme_cache_post %icon_theme_cache_post HighContrast %mime_database_post %postun %desktop_database_postun +%glib2_gsettings_schema_postun %icon_theme_cache_postun %icon_theme_cache_postun HighContrast %mime_database_postun @@ -102,21 +106,19 @@ %files %defattr(-,root,root,-) %doc COPYING NEWS -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ -%dir %{_datadir}/omf/ -%dir %{_datadir}/omf/%{name}/ -%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/%{name} %{_datadir}/%{name}/ %dir %{_datadir}/appdata/ %{_datadir}/appdata/meld.appdata.xml %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml +%{_datadir}/help/C/meld/ +%{_datadir}/icons/hicolor/*/*/%{name}* %{_datadir}/icons/HighContrast/ %{_datadir}/mime/packages/meld.xml +%{_mandir}/man1/meld.1%{?ext_man} +%{python_sitelib}/meld/ +%{python_sitelib}/meld*egg-info* %files lang -f %{name}.lang ++++++ meld-1.8.6.tar.xz -> meld-3.11.4.tar.xz ++++++ ++++ 82095 lines of diff (skipped) ++++++ meld-nodocs.patch ++++++ Index: meld-3.11.0/setup.py =================================================================== --- meld-3.11.0.orig/setup.py +++ meld-3.11.0/setup.py @@ -39,9 +39,6 @@ setup( ('share/man/man1', ['meld.1'] ), - ('share/doc/meld-' + meld.conf.__version__, - ['COPYING', 'NEWS'] - ), ('share/meld', ['data/meld.css'] ), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit collectl for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package collectl for openSUSE:Factory checked in at 2014-09-26 10:52:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectl (Old) and /work/SRC/openSUSE:Factory/.collectl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "collectl" Changes: -------- --- /work/SRC/openSUSE:Factory/collectl/collectl.changes 2013-12-16 15:46:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.collectl.new/collectl.changes 2014-09-26 11:21:26.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 24 19:41:02 UTC 2014 - tabraham(a)suse.com + +- Update to version 3.7.4 + See RELEASE-collectl for changes + +------------------------------------------------------------------- Old: ---- collectl-3.6.9.src.tar.gz New: ---- collectl-3.7.4.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectl.spec ++++++ --- /var/tmp/diff_new_pack.8Chr9T/_old 2014-09-26 11:21:26.000000000 +0200 +++ /var/tmp/diff_new_pack.8Chr9T/_new 2014-09-26 11:21:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package collectl # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -21,7 +21,7 @@ License: Artistic-1.0 and GPL-2.0+ Group: System/Monitoring Url: http://collectl.sourceforge.net -Version: 3.6.9 +Version: 3.7.4 Release: 0 Source0: %name-%version.src.tar.gz Source1: collectl.service @@ -48,7 +48,10 @@ install -m 644 -D collectl.conf %buildroot/%_sysconfdir/collectl.conf install -D formatit.ph %buildroot%_datadir/%name/formatit.ph install -D lexpr.ph %buildroot%_datadir/%name/lexpr.ph -install -D sexpr.ph %buildroot%_datadir/%name/sexpr.ph +install -D gexpr.ph %buildroot%_datadir/%name/gexpr.ph +install -D misc.ph %buildroot%_datadir/%name/misc.ph +install -D hello.ph %buildroot%_datadir/%name/hello.ph +install -D graphite.ph %buildroot%_datadir/%name/graphite.ph install -D vmstat.ph %buildroot%_datadir/%name/vmstat.ph install -m 755 -D %{SOURCE1} %buildroot/%{_unitdir}/collectl.service ln -sf /sbin/service %{buildroot}/usr/sbin/rccollectl ++++++ collectl-3.6.9.src.tar.gz -> collectl-3.7.4.src.tar.gz ++++++ ++++ 5691 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

commit rng-tools for openSUSE:Factory
by root＠hilbert.suse.de 26 Sep '14

26 Sep '14

Hello community, here is the log from the commit of package rng-tools for openSUSE:Factory checked in at 2014-09-26 10:52:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rng-tools (Old) and /work/SRC/openSUSE:Factory/.rng-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rng-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/rng-tools/rng-tools.changes 2014-09-06 12:18:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rng-tools.new/rng-tools.changes 2014-09-26 11:21:25.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 19 00:28:16 CEST 2014 - ro(a)suse.de + +- add patch: rng-tools-check_signals.patch (bnc#897335) + check for signals in all loops to react to SIGINT/SIGTERM + +------------------------------------------------------------------- New: ---- rng-tools-check_signals.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rng-tools.spec ++++++ --- /var/tmp/diff_new_pack.J316CY/_old 2014-09-26 11:21:26.000000000 +0200 +++ /var/tmp/diff_new_pack.J316CY/_new 2014-09-26 11:21:26.000000000 +0200 @@ -26,6 +26,7 @@ Source: http://sourceforge.net/projects/gkernel/files/%{name}/%{version}/%{name}-%{… Source2: %{name}.service Source3: 90-hwrng.rules +Patch0: rng-tools-check_signals.patch BuildRequires: libgcrypt-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(systemd) @@ -76,6 +77,7 @@ %prep %setup -q +%patch0 %build %configure ++++++ rng-tools-check_signals.patch ++++++ --- rngd.c +++ rngd.c @@ -218,6 +218,8 @@ for (p = buf; p + random_step <= &buf[FIPS_RNG_BUFFER_SIZE]; p += random_step) { + if (!server_running) + return 0; random_add_entropy(p, random_step); random_sleep(); } @@ -239,10 +241,10 @@ { int rc; + retry_same: if (!server_running) return; - retry_same: if (iter->disabled) continue; /* failed, no work */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0