February 2013 - openSUSE Commits - openSUSE Mailing Lists

commit jakarta-commons-httpclient for openSUSE:12.3:Update
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package jakarta-commons-httpclient for openSUSE:12.3:Update checked in at 2013-02-21 13:25:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/jakarta-commons-httpclient (Old) and /work/SRC/openSUSE:12.3:Update/.jakarta-commons-httpclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jakarta-commons-httpclient", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='jakarta-commons-httpclient.1351' 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 jakarta-commons-httpclient.1351 for openSUSE:12.3:Update
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package jakarta-commons-httpclient.1351 for openSUSE:12.3:Update checked in at 2013-02-21 13:25:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/jakarta-commons-httpclient.1351 (Old) and /work/SRC/openSUSE:12.3:Update/.jakarta-commons-httpclient.1351.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jakarta-commons-httpclient.1351", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-09 11:18:20.872010756 +0100 +++ /work/SRC/openSUSE:12.3:Update/.jakarta-commons-httpclient.1351.new/jakarta-commons-httpclient.changes 2013-02-21 13:25:23.000000000 +0100 @@ -0,0 +1,48 @@ +------------------------------------------------------------------- +Thu Feb 14 09:10:48 UTC 2013 - mvyskocil(a)suse.com + +- fix bnc#803332: no ssl certificate hostname checking (CVE-2012-5783) + * commons-httpclient-CVE-2012-5783.patch + +------------------------------------------------------------------- +Fri May 25 11:18:20 UTC 2012 - mvyskocil(a)suse.cz + +- update to 3.1 (bugfix release) +- make sure it works with jdk7 +- improve spec (ie non-versioned javadoc dir) +- rename to jakarta-commons-httpclient to remain compatible + +------------------------------------------------------------------- +Thu Jul 17 07:45:10 CEST 2008 - coolo(a)suse.de + +- avoid another build cycle + +------------------------------------------------------------------- +Mon Oct 2 15:47:26 CEST 2006 - dbornkessel(a)suse.de + +- update to v3.0.1 +- fixes necessary to compile with Java 1.5.0 (in 3.0.1 version) + - set source="1.4" and target="1.4" for ant "javac" tasks + - set source="1.4" for ant "javadoc" tasks + +------------------------------------------------------------------- +Mon Sep 25 12:47:02 CEST 2006 - skh(a)suse.de + +- don't use icecream +- use source="1.4" and target="1.4" for build with java 1.5 + +------------------------------------------------------------------- +Wed Jan 25 21:46:37 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 4 18:21:39 CET 2006 - dbornkessel(a)suse.de + +- disabled and 'test' target as that was specially written for sun JRE and hence fails with other JREs + +------------------------------------------------------------------- +Mon Dec 19 21:02:45 CET 2005 - dbornkessel(a)suse.de + +- Current version 3.0 from JPackage.org + New: ---- commons-httpclient-3.1-src.tar.gz commons-httpclient-CVE-2012-5783.patch jakarta-commons-httpclient-addosgimanifest.patch jakarta-commons-httpclient-disablecryptotests.patch jakarta-commons-httpclient-encoding.patch jakarta-commons-httpclient.changes jakarta-commons-httpclient.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-httpclient.spec ++++++ # # spec file for package jakarta-commons-httpclient # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # icecream 0 %define short_name commons-httpclient Name: jakarta-commons-httpclient Version: 3.1 Release: 0 Summary: Feature rich package for accessing resources via HTTP License: Apache-2.0 Group: Development/Libraries/Java Url: http://jakarta.apache.org/commons/httpclient/ #Source0: http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-ht… Source0: commons-httpclient-%{version}-src.tar.gz Patch0: %{name}-disablecryptotests.patch # Add OSGi MANIFEST.MF bits Patch1: %{name}-addosgimanifest.patch Patch2: %{name}-encoding.patch #PATCH-FIX-UPSTREAM: bnc#803332 #http://svn.apache.org/viewvc?view=revision&revision=483925 Patch3: commons-httpclient-CVE-2012-5783.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ant BuildRequires: commons-codec BuildRequires: commons-logging >= 1.0.3 #BuildRequires: java-javadoc #BuildRequires: apache-commons-logging-javadoc BuildRequires: java-devel BuildRequires: junit Requires: commons-codec Requires: commons-logging >= 1.0.3 Provides: %{short_name} = %{version}-%{release} Provides: %{name}3 = %{version}-%{release} Obsoletes: %{name}3 < %{version}-%{release} %description Although the java.net package provides basic functionality for accessing resources via HTTP, it doesn't provide the full flexibility or functionality needed by many applications. The Jakarta Commons HttpClient component seeks to fill this void by providing an efficient, up-to-date, and feature-rich package implementing the client side of the most recent HTTP standards and recommendations. Designed for extension while providing robust support for the base HTTP protocol, the HttpClient component may be of interest to anyone building HTTP-aware client applications such as web browsers, web service clients, or systems that leverage or extend the HTTP protocol for distributed communication. %package javadoc PreReq: coreutils Summary: Developer documentation for jakarta-commons-httpclient Group: Development/Libraries/Java %description javadoc Developer documentation for jakarta-commons-httpclient in JavaDoc format. %{summary}. %package demo Summary: Demonstration files for jakarta-commons-httpclient Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} %description demo Demonstration files for jakarta-commons-httpclient. NOTE: It is possible that some demonstration files are specially prepared for SUN Java runtime environment. If they fail with IBM or BEA Java, the package itself does not need to be broken. %{summary}. %package manual Summary: Manual for jakarta-commons-httpclient Group: Development/Libraries/Java %description manual Manual for jakarta-commons-httpclient %{summary}. %prep %setup -q -n commons-httpclient-%{version} mkdir lib # duh rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej %patch0 pushd src/conf %{__sed} -i 's/\r//' MANIFEST.MF %patch1 popd %patch2 %patch3 -p1 # Use javax classes, not com.sun ones # assume no filename contains spaces pushd src for j in $(find . -name "*.java" -exec grep -l 'com\.sun\.net\.ssl' {} \;); do sed -e 's|com\.sun\.net\.ssl|javax.net.ssl|' $j > tempf cp tempf $j done rm tempf popd %{__sed} -i 's/\r//' RELEASE_NOTES.txt %{__sed} -i 's/\r//' README.txt %{__sed} -i 's/\r//' LICENSE.txt %build ant \ -Dbuild.sysclasspath=first \ -Djavadoc.j2sdk.link=%{_javadocdir}/java \ -Djavadoc.logging.link=%{_javadocdir}/apache-commons-logging \ -Dtest.failonerror=false \ -Dlib.dir=%{_javadir} \ -Djavac.encoding=UTF-8 \ dist test %install # jars mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p dist/commons-httpclient.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # compat symlink pushd $RPM_BUILD_ROOT%{_javadir} ln -s jakarta-commons-httpclient.jar jakarta-commons-httpclient3.jar ln -s jakarta-commons-httpclient.jar commons-httpclient3.jar ln -s jakarta-commons-httpclient.jar commons-httpclient.jar popd # javadoc mkdir -p $RPM_BUILD_ROOT%{_javadocdir} mv dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} # demo mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr src/examples src/contrib $RPM_BUILD_ROOT%{_datadir}/%{name} # manual and docs rm -f dist/docs/{BUILDING,TESTING}.txt ln -s %{_javadocdir}/%{name} dist/docs/apidocs %clean rm -rf $RPM_BUILD_ROOT %files %defattr(0644,root,root,0755) %doc LICENSE.txt README.txt RELEASE_NOTES.txt %{_javadir}/%{name}.jar %{_javadir}/jakarta-commons-httpclient3.jar %{_javadir}/commons-httpclient3.jar %{_javadir}/commons-httpclient.jar %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name} %files demo %defattr(0644,root,root,0755) %{_datadir}/%{name} %files manual %defattr(0644,root,root,0755) %doc dist/docs/* %changelog ++++++ commons-httpclient-CVE-2012-5783.patch ++++++ Index: commons-httpclient-3.1/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java =================================================================== --- commons-httpclient-3.1.orig/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java +++ commons-httpclient-3.1/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java @@ -31,10 +31,17 @@ package org.apache.commons.httpclient.protocol; import java.io.IOException; +import java.io.InputStream; import java.net.InetAddress; import java.net.Socket; import java.net.UnknownHostException; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; + +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; import org.apache.commons.httpclient.ConnectTimeoutException; @@ -79,12 +86,17 @@ public class SSLProtocolSocketFactory im InetAddress clientHost, int clientPort) throws IOException, UnknownHostException { - return SSLSocketFactory.getDefault().createSocket( + SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket( host, port, clientHost, clientPort ); + + verifyHostName( host, (SSLSocket) socket ); + + // verifyHostName() didn't blowup - good! + return socket; } /** @@ -124,15 +136,18 @@ public class SSLProtocolSocketFactory im } int timeout = params.getConnectionTimeout(); if (timeout == 0) { - return createSocket(host, port, localAddress, localPort); + SSLSocket socket = (SSLSocket) createSocket(host, port, localAddress, localPort); + verifyHostName(host, (SSLSocket) socket); + return socket; } else { // To be eventually deprecated when migrated to Java 1.4 or above - Socket socket = ReflectionSocketFactory.createSocket( + SSLSocket socket =(SSLSocket) ReflectionSocketFactory.createSocket( "javax.net.ssl.SSLSocketFactory", host, port, localAddress, localPort, timeout); if (socket == null) { - socket = ControllerThreadSocketFactory.createSocket( + socket = (SSLSocket) ControllerThreadSocketFactory.createSocket( this, host, port, localAddress, localPort, timeout); } + verifyHostName(host, (SSLSocket) socket); return socket; } } @@ -142,10 +157,12 @@ public class SSLProtocolSocketFactory im */ public Socket createSocket(String host, int port) throws IOException, UnknownHostException { - return SSLSocketFactory.getDefault().createSocket( + SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket( host, port ); + verifyHostName( host, (SSLSocket) socket ); + return socket; } /** @@ -157,14 +174,133 @@ public class SSLProtocolSocketFactory im int port, boolean autoClose) throws IOException, UnknownHostException { - return ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket( + SSLSocket s = (SSLSocket) ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket( socket, host, port, autoClose ); + verifyHostName( host, (SSLSocket) socket ); + + // verifyHostName() didn't blowup - good! + return s; + } + + private static void verifyHostName( String host, SSLSocket ssl ) + throws IOException { + if ( host == null ) { + throw new NullPointerException( "host to verify was null" ); + } + + SSLSession session = ssl.getSession(); + if ( session == null ) { + // In our experience this only happens under IBM 1.4.x when + // spurious (unrelated) certificates show up in the server's chain. + // Hopefully this will unearth the real problem: + InputStream in = ssl.getInputStream(); + in.available(); + /* + If you're looking at the 2 lines of code above because you're + running into a problem, you probably have two options: + + #1. Clean up the certificate chain that your server + is presenting (e.g. edit "/etc/apache2/server.crt" or + wherever it is your server's certificate chain is + defined). + + OR + + #2. Upgrade to an IBM 1.5.x or greater JVM, or switch to a + non-IBM JVM. + */ + + // If ssl.getInputStream().available() didn't cause an exception, + // maybe at least now the session is available? + session = ssl.getSession(); + if ( session == null ) { + // If it's still null, probably a startHandshake() will + // unearth the real problem. + ssl.startHandshake(); + + // Okay, if we still haven't managed to cause an exception, + // might as well go for the NPE. Or maybe we're okay now? + session = ssl.getSession(); + } + } + + Certificate[] certs = session.getPeerCertificates(); + X509Certificate x509 = (X509Certificate) certs[ 0 ]; + String cn = getCN( x509 ); + if ( cn == null ) { + String subject = x509.getSubjectX500Principal().toString(); + String msg = "certificate doesn't contain CN: " + subject; + throw new SSLException( msg ); + } + // I'm okay with being case-insensitive when comparing the host we used + // to establish the socket to the hostname in the certificate. + // Don't trim the CN, though. + cn = cn.toLowerCase(); + host = host.trim().toLowerCase(); + boolean doWildcard = false; + if ( cn.startsWith( "*." ) ) { + // The CN better have at least two dots if it wants wildcard action, + // but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc... + String withoutCountryCode = ""; + if ( cn.length() >= 7 && cn.length() <= 9 ) { + withoutCountryCode = cn.substring( 2, cn.length() - 2 ); + } + doWildcard = cn.lastIndexOf( '.' ) >= 0 && + !"ac.".equals( withoutCountryCode ) && + !"co.".equals( withoutCountryCode ) && + !"com.".equals( withoutCountryCode ) && + !"ed.".equals( withoutCountryCode ) && + !"edu.".equals( withoutCountryCode ) && + !"go.".equals( withoutCountryCode ) && + !"gouv.".equals( withoutCountryCode ) && + !"gov.".equals( withoutCountryCode ) && + !"info.".equals( withoutCountryCode ) && + !"lg.".equals( withoutCountryCode ) && + !"ne.".equals( withoutCountryCode ) && + !"net.".equals( withoutCountryCode ) && + !"or.".equals( withoutCountryCode ) && + !"org.".equals( withoutCountryCode ); + + // The [*.co.uk] problem is an interesting one. Should we just + // hope that CA's would never foolishly allow such a + // certificate to happen? + } + + boolean match; + if ( doWildcard ) { + match = host.endsWith( cn.substring( 1 ) ); + } else { + match = host.equals( cn ); + } + if ( !match ) { + throw new SSLException( "hostname in certificate didn't match: <" + host + "> != <" + cn + ">" ); + } } + private static String getCN( X509Certificate cert ) { + // Note: toString() seems to do a better job than getName() + // + // For example, getName() gives me this: + // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d + // + // whereas toString() gives me this: + // EMAILADDRESS=juliusdavies(a)cucbc.com + String subjectPrincipal = cert.getSubjectX500Principal().toString(); + int x = subjectPrincipal.indexOf( "CN=" ); + if ( x >= 0 ) { + int y = subjectPrincipal.indexOf( ',', x ); + // If there are no more commas, then CN= is the last entry. + y = ( y >= 0 ) ? y : subjectPrincipal.length(); + return subjectPrincipal.substring( x + 3, y ); + } else { + return null; + } + } + /** * All instances of SSLProtocolSocketFactory are the same. */ ++++++ jakarta-commons-httpclient-addosgimanifest.patch ++++++ --- MANIFEST.MF 2007-09-06 12:31:02.000000000 -0400 +++ MANIFEST.MF 2007-09-06 12:30:45.000000000 -0400 @@ -3,4 +3,27 @@ Specification-Version: 1.0 Implementation-Vendor: Apache Software Foundation Implementation-Version: @version@ - +Bundle-ManifestVersion: 2 +Bundle-Name: %bundleName +Bundle-SymbolicName: org.apache.commons.httpclient +Bundle-Version: 3.1.0.v20080605-1935 +Import-Package: javax.crypto;resolution:=optional, + javax.crypto.spec;resolution:=optional, + javax.net;resolution:=optional, + javax.net.ssl;resolution:=optional, + org.apache.commons.codec;version="[1.2.0,2.0.0)", + org.apache.commons.codec.binary;version="[1.2.0,2.0.0)", + org.apache.commons.codec.net;version="[1.2.0,2.0.0)", + org.apache.commons.logging;version="[1.0.4,2.0.0)" +Export-Package: org.apache.commons.httpclient;version="3.1.0", + org.apache.commons.httpclient.auth;version="3.1.0", + org.apache.commons.httpclient.cookie;version="3.1.0", + org.apache.commons.httpclient.methods;version="3.1.0", + org.apache.commons.httpclient.methods.multipart;version="3.1.0", + org.apache.commons.httpclient.params;version="3.1.0", + org.apache.commons.httpclient.protocol;version="3.1.0", + org.apache.commons.httpclient.util;version="3.1.0" +Bundle-Vendor: %bundleProvider +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, + J2SE-1.2 ++++++ jakarta-commons-httpclient-disablecryptotests.patch ++++++ --- ./src/test/org/apache/commons/httpclient/params/TestParamsAll.java.sav 2006-07-20 18:42:17.000000000 -0400 +++ ./src/test/org/apache/commons/httpclient/params/TestParamsAll.java 2006-07-20 18:42:26.000000000 -0400 @@ -43,7 +43,6 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(TestHttpParams.suite()); - suite.addTest(TestSSLTunnelParams.suite()); return suite; } --- ./src/test/org/apache/commons/httpclient/TestAll.java.sav 2006-07-20 18:42:56.000000000 -0400 +++ ./src/test/org/apache/commons/httpclient/TestAll.java 2006-07-20 18:43:01.000000000 -0400 @@ -100,7 +100,6 @@ // Non compliant behaviour suite.addTest(TestNoncompliant.suite()); // Proxy - suite.addTest(TestProxy.suite()); suite.addTest(TestProxyWithRedirect.suite()); return suite; } ++++++ jakarta-commons-httpclient-encoding.patch ++++++ --- build.xml 2007-08-18 05:02:14.000000000 -0400 +++ build.xml 2012-01-23 09:52:50.405796336 -0500 @@ -179,6 +179,7 @@ description="Compile shareable components"> <javac srcdir ="${source.home}/java" destdir ="${build.home}/classes" + encoding ="ISO-8859-1" debug ="${compile.debug}" deprecation ="${compile.deprecation}" optimize ="${compile.optimize}"> @@ -186,6 +187,7 @@ </javac> <javac srcdir ="${source.home}/examples" destdir ="${build.home}/examples" + encoding ="ISO-8859-1" debug ="${compile.debug}" deprecation ="${compile.deprecation}" optimize ="${compile.optimize}"> @@ -197,6 +199,7 @@ description="Compile unit test cases"> <javac srcdir ="${test.home}" destdir ="${build.home}/tests" + encoding ="ISO-8859-1" debug ="${compile.debug}" deprecation ="${compile.deprecation}" optimize ="${compile.optimize}"> @@ -244,6 +244,7 @@ <mkdir dir="${dist.home}/docs/api"/> <javadoc sourcepath ="${source.home}/java" destdir ="${dist.home}/docs/api" + encoding ="ISO-8859-1" packagenames ="org.apache.commons.*" author ="true" protected ="true" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-firmware for openSUSE:12.3
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:12.3 checked in at 2013-02-21 10:55:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kernel-firmware (Old) and /work/SRC/openSUSE:12.3/.kernel-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-firmware", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/kernel-firmware/kernel-firmware.changes 2013-02-17 17:02:32.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kernel-firmware.new/kernel-firmware.changes 2013-02-21 10:55:16.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 21 09:24:39 UTC 2013 - Larry.Finger(a)lwfinger.net + +- fix previous fix to build on factory/12.3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux-firmware-20130114git.tar.bz2 ++++++ /work/SRC/openSUSE:12.3/kernel-firmware/linux-firmware-20130114git.tar.bz2 /work/SRC/openSUSE:12.3/.kernel-firmware.new/linux-firmware-20130114git.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-firmware for openSUSE:Factory
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:Factory checked in at 2013-02-21 10:55:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-firmware (Old) and /work/SRC/openSUSE:Factory/.kernel-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-firmware", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware.changes 2013-02-17 17:02:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-firmware.new/kernel-firmware.changes 2013-02-21 10:55:10.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 21 09:24:39 UTC 2013 - Larry.Finger(a)lwfinger.net + +- fix previous fix to build on factory/12.3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux-firmware-20130114git.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kernel-firmware/linux-firmware-20130114git.tar.bz2 /work/SRC/openSUSE:Factory/.kernel-firmware.new/linux-firmware-20130114git.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-client for openSUSE:12.3
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:12.3 checked in at 2013-02-21 10:47:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/yast2-samba-client (Old) and /work/SRC/openSUSE:12.3/.yast2-samba-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-client", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/yast2-samba-client/yast2-samba-client.changes 2013-01-31 01:47:08.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.yast2-samba-client.new/yast2-samba-client.changes 2013-02-21 10:48:01.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 20 11:44:33 CET 2013 - jsuchome(a)suse.cz + +- synchronize cluster before restarting CTDB clone service + (bnc#802814) +- force synchronization of smb.conf (bnc#802814) +- do not use hard-coded ctdb resource identifier (bnc#804303) +- 2.23.2 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-2.23.1.tar.bz2 New: ---- yast2-samba-client-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.BZ8USQ/_old 2013-02-21 10:48:01.000000000 +0100 +++ /var/tmp/diff_new_pack.BZ8USQ/_new 2013-02-21 10:48:01.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 2.23.1 +Version: 2.23.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-samba-client-2.23.1.tar.bz2 -> yast2-samba-client-2.23.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/VERSION new/yast2-samba-client-2.23.2/VERSION --- old/yast2-samba-client-2.23.1/VERSION 2013-01-18 10:35:22.000000000 +0100 +++ new/yast2-samba-client-2.23.2/VERSION 2013-02-20 14:41:33.000000000 +0100 @@ -1 +1 @@ -2.23.1 +2.23.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/configure new/yast2-samba-client-2.23.2/configure --- old/yast2-samba-client-2.23.1/configure 2013-01-18 10:43:32.000000000 +0100 +++ new/yast2-samba-client-2.23.2/configure 2013-02-20 14:41:46.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-samba-client 2.23.1. +# Generated by GNU Autoconf 2.69 for yast2-samba-client 2.23.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-samba-client' PACKAGE_TARNAME='yast2-samba-client' -PACKAGE_VERSION='2.23.1' -PACKAGE_STRING='yast2-samba-client 2.23.1' +PACKAGE_VERSION='2.23.2' +PACKAGE_STRING='yast2-samba-client 2.23.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-samba-client 2.23.1 to adapt to many kinds of systems. +\`configure' configures yast2-samba-client 2.23.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-samba-client 2.23.1:";; + short | recursive ) echo "Configuration of yast2-samba-client 2.23.2:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-samba-client configure 2.23.1 +yast2-samba-client configure 2.23.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-samba-client $as_me 2.23.1, which was +It was created by yast2-samba-client $as_me 2.23.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-samba-client' - VERSION='2.23.1' + VERSION='2.23.2' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.23.1" +VERSION="2.23.2" RPMNAME="yast2-samba-client" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -3404,7 +3404,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-samba-client $as_me 2.23.1, which was +This file was extended by yast2-samba-client $as_me 2.23.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-samba-client config.status 2.23.1 +yast2-samba-client config.status 2.23.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/configure.in new/yast2-samba-client-2.23.2/configure.in --- old/yast2-samba-client-2.23.1/configure.in 2013-01-18 10:43:29.000000000 +0100 +++ new/yast2-samba-client-2.23.2/configure.in 2013-02-20 14:41:42.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-client, 2.23.1, http://bugs.opensuse.org/, yast2-samba-client) +AC_INIT(yast2-samba-client, 2.23.2, http://bugs.opensuse.org/, yast2-samba-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.1" +VERSION="2.23.2" RPMNAME="yast2-samba-client" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/src/Samba.ycp new/yast2-samba-client-2.23.2/src/Samba.ycp --- old/yast2-samba-client-2.23.1/src/Samba.ycp 2013-01-18 10:37:00.000000000 +0100 +++ new/yast2-samba-client-2.23.2/src/Samba.ycp 2013-02-20 14:41:33.000000000 +0100 @@ -740,7 +740,16 @@ if (FileUtils::Exists ("/usr/sbin/csync2")) { - map out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -xv"); + // first, force syncing of smb.conf (bnc#802814) + map out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -f /etc/samba/smb.conf"); + if (out["exit"]:0 != 0) + { + y2error ("csync2 failed with %1", out); + return false; + } + + // sync the rest + out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -xv"); if (out["exit"]:0 != 0) { y2error ("csync2 failed with %1", out); @@ -838,8 +847,6 @@ ret = false; } - SambaNetJoin::CleanupCTDB (); - // winbind Progress::NextStage(); if (winbind_enabled && !cluster_present) { @@ -919,9 +926,11 @@ y2warning ("pam-config failed for service %1", service); }); } + if (cluster_present) { SynchronizeCluster (); + SambaNetJoin::CleanupCTDB (); } // finished diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/src/SambaAD.pm new/yast2-samba-client-2.23.2/src/SambaAD.pm --- old/yast2-samba-client-2.23.1/src/SambaAD.pm 2013-01-18 10:37:00.000000000 +0100 +++ new/yast2-samba-client-2.23.2/src/SambaAD.pm 2013-02-20 14:41:33.000000000 +0100 @@ -69,9 +69,9 @@ return $dhcp_client if (defined $dhcp_client) && !$force; my $network = YaPI::NETWORK->Read (); - $dhcp_client = FALSE; + $dhcp_client = TRUE; foreach my $iface (values %{$network->{"interfaces"}}) { - $dhcp_client = $dhcp_client || (($iface->{"bootproto"} || "") =~ m/^dhcp[46]?$/); + $dhcp_client = $dhcp_client && (($iface->{"bootproto"} || "") =~ m/^dhcp[46]?$/); } return $dhcp_client; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/src/SambaNetJoin.pm new/yast2-samba-client-2.23.2/src/SambaNetJoin.pm --- old/yast2-samba-client-2.23.1/src/SambaNetJoin.pm 2013-01-18 10:41:41.000000000 +0100 +++ new/yast2-samba-client-2.23.2/src/SambaNetJoin.pm 2013-02-20 14:41:33.000000000 +0100 @@ -41,10 +41,12 @@ # if DNS should be adapted with AD server my $adapt_dns = FALSE; +# name of base resource +my $rsc_id = ""; + # name of clone resource my $clone_id = ""; - # Helper function to execute crm binary (internal only, not part of API). # Takes all arguments in one string. sub CRMCall { @@ -94,12 +96,12 @@ return FALSE; } - # find out the clone resource id, to do later crm operations with + # find out resource and clone ids, to do later crm operations with my $show = CRMCall ("configure save -"); if ($show =~ /primitive (\w+) ocf:heartbeat:CTDB/) { - my $primitive = $1; - if ($show =~ /clone (.+) $primitive/) { - $clone_id = $1; + $rsc_id = $1; + if ($show =~ /clone (.+) $rsc_id/) { + $clone_id = $1; } } @@ -159,7 +161,7 @@ # 3. Run crm configure edit and search for the ctdb resource. Add the following line: # ctdb_manages_winbind="false" - CRMCall ("resource param ctdb set ctdb_manages_winbind no"); + CRMCall ("resource param $rsc_id set ctdb_manages_winbind no"); # 4. save winbind into /etc/nsswitch.conf # 5. Restart the NSC daemon: @@ -200,7 +202,7 @@ CRMCall ("resource stop $clone_id"); # b. Change the value from false to true: ctdb_manages_winbind="true" - CRMCall ("resource param ctdb set ctdb_manages_winbind yes"); + CRMCall ("resource param $rsc_id set ctdb_manages_winbind yes"); # c. Restart the ctdb resource: CRMCall ("resource start $clone_id"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/Makefile.am new/yast2-samba-client-2.23.2/testsuite/Makefile.am --- old/yast2-samba-client-2.23.1/testsuite/Makefile.am 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/Makefile.am 2013-02-20 14:41:33.000000000 +0100 @@ -5,7 +5,7 @@ # AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.pl) $(wildcard tests/*.pm) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/Makefile.in new/yast2-samba-client-2.23.2/testsuite/Makefile.in --- old/yast2-samba-client-2.23.1/testsuite/Makefile.in 2013-01-18 10:43:34.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/Makefile.in 2013-02-20 14:41:47.000000000 +0100 @@ -195,7 +195,7 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.pl) $(wildcard tests/*.pm) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.out new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.out --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.out 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.out 2013-02-20 14:41:33.000000000 +0100 @@ -1,24 +1,3 @@ -dump1: [_internal] -dump1: abc = ABC -dump1: -dump1: [a] -dump1: Bee Bee = x -dump1: _comment = A -dump1: _disabled = 1 -dump1: _modified = 1 -dump1: _xxx = 8 -dump1: -dump1: [b] -dump1: Two Two = 22 -dump1: no = <undefined> -dump1: -dump1: [removed] - -dump2: [a] -dump2: _comment = A -dump2: _disabled = 1 -dump2: bee bee = x -dump2: -dump2: [b] -dump2: two two = 22 - +Dump $["_internal":$["abc":"ABC"], "a":$["Bee Bee":"x", "_comment":"A", "_disabled":true, "_modified":true, "_xxx":8], "b":$["Two Two":22, "no":nil], "removed":nil] +Return nil +Return [$["comment":"A", "disabled":true, "name":"a", "parameters":$["bee_bee":"x"]], $["name":"b", "parameters":$["two_two":"22"]]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -#!/usr/bin/perl - -use strict; - -use SambaConfig; -use Data::Dumper; - -## test Get/Set Modified -SambaConfig->Import({ - a=>{"Bee Bee"=>"x", _modified=>1, _disabled=>1, _xxx=>8, _comment=>"A"}, - _internal=>{abc=>"ABC"}, - removed=>undef, - b=>{no=>undef, "Two Two"=>22}}); -SambaConfig->Dump("dump1: "); - -my $dump = SambaConfig->Export(); -#print Dumper($dump); - -SambaConfig->Import($dump); -SambaConfig->Dump("dump2: "); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.ycp new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.ycp --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.ycp 2013-02-20 14:41:33.000000000 +0100 @@ -0,0 +1,32 @@ +/** + * test SambaConfig::Export: + * should remove modified flags and internal shares from config + */ +{ + import "Testsuite"; + import "SambaConfig"; + + map i = $[ + "a" : $[ + "Bee Bee" : "x", + "_modified" : true, + "_disabled" : true, + "_xxx" : 8, + "_comment" : "A" + ], + "_internal" : $[ + "abc" : "ABC" + ], + "removed" : nil, + "b" : $[ + "no" : nil, + "Two Two" : 22 + ] + ]; + + Testsuite::Dump (i); + + Testsuite::Test(``(SambaConfig::Import (i)), [ $[], $[], $[] ], 0); + + Testsuite::Test (``(SambaConfig::Export ()), [], 0); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_Global.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_Global.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_Global.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_Global.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -#!/usr/bin/perl - -use SambaConfig; -use Data::Dumper; - -# test Configured -print Dumper(SambaConfig->Configured()); -SambaConfig->Import({a=>{b=>"x"}}); -print Dumper(SambaConfig->Configured()); - -# test Get/Set Modified -print Dumper(SambaConfig->GetModified()); -SambaConfig->SetModified(); -print Dumper(SambaConfig->GetModified()); - -# test GetShares -print Dumper(SambaConfig->GetShares()); - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ReadWrite.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ReadWrite.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ReadWrite.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ReadWrite.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -#!/usr/bin/perl - -use SambaConfig; -use Data::Dumper; - -$smb_conf = "/etc/samba/smb.conf"; -$smb_conf_bak = "/tmp/smb.conf"; -die "no permision to write to $smb_conf" unless -w $smb_conf; - -# backup smb.conf -if ( -f $smb_conf && not -f $smb_conf_bak ) { - open(SMB, "<", $smb_conf) or die $!; - open(BAK, ">", $smb_conf_bak) or die $!; - print BAK <SMB>; - close BAK; close SMB; -} -# truncate smb.conf -open(SMB, ">", $smb_conf) or die $!; close SMB; - -# no write -SambaConfig->Import({ - a => {b=>"y"}, - home => {path=>"/dev", _modified=>1}, - global => {x=>"y"}}); -SambaConfig->Write(); -SambaConfig->Import(); -SambaConfig->Read(); -SambaConfig->Dump(); - -# normal write -SambaConfig->Import({ - a => {b=>"y", _modified=>1}, - home => {path=>"/dev", _modified=>1}, - global => {_modified=>1, abc=>"ABC"}}); -SambaConfig->ShareRemove("home"); -SambaConfig->Write(); -SambaConfig->Import(); -SambaConfig->Read(); -SambaConfig->Dump(); - -# write disabled share -SambaConfig->Import({ - a => {b=>undef, c=>"z", _modified=>1, _disabled=>1}, - global => {_modified=>1, abc=>undef, def=>"DEF"}}); -SambaConfig->Write(); -SambaConfig->Import(); -SambaConfig->Read(); -SambaConfig->Dump(); - -# write (force) share with comment -SambaConfig->Import({ - a => {c=>"q",_disabled=>1,_comment=>"share disabled by gizo"}, - _my => {my=>1}, - global => {ghc=>"GHC"}}); -SambaConfig->Write(1); -SambaConfig->Import(); -SambaConfig->Read(); -SambaConfig->Dump(); - -# restore smb.conf -open(SMB, ">", $smb_conf) or die $!; -open(BAK, "<", $smb_conf_bak) or die $!; -print SMB <BAK>; -close BAK; close SMB; - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_Share.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_Share.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_Share.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_Share.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,120 +0,0 @@ -#!/usr/bin/perl - -use SambaConfig; -use Data::Dumper; - -# test general shares - -SambaConfig->Import( -{ - a=>{x=>"y"}, - b=>{u=>"v", _internal=>"xxx", no=>undef}, - ro=>{"read only"=>"Yes", "root directory"=>"/root", int=>8}, - rw=>{"read only"=>"No", "root directory"=>"/dev/zero", _disabled=>1}, -}); - -print Dumper("ShareRemove", - !defined SambaConfig->ShareRemove(), - SambaConfig->ShareRemove("a"), - !SambaConfig->ShareRemove("a")); - -print Dumper("ShareExists", - !defined SambaConfig->ShareExists(), - !SambaConfig->ShareExists("a"), - SambaConfig->ShareExists("b")); - -print Dumper("ShareKeys", - !defined SambaConfig->ShareKeys(), - $#{SambaConfig->ShareKeys("a")}==-1, - $#{SambaConfig->ShareKeys("b")}==0); - -print Dumper("ShareSetStr", - !defined SambaConfig->ShareSetStr(), - !defined SambaConfig->ShareSetStr("g"), - SambaConfig->ShareSetStr("g","My Key", "My Val"), - !SambaConfig->ShareSetStr("g","Lock Dir"), - SambaConfig->ShareSetStr("g","Lock Dir", "/dev"), - SambaConfig->ShareSetStr("g","Lock Dir", "/home"), - !SambaConfig->ShareSetStr("g","Lock Dir", "/home"), - SambaConfig->ShareSetStr("g","Lock Dir"), - !SambaConfig->ShareSetStr("g","writable"), - SambaConfig->ShareSetStr("g","writable", 1), - !SambaConfig->ShareSetStr("g","writable", 1), - SambaConfig->ShareSetStr("g","writable", 0), - SambaConfig->ShareSetStr("g","writable")); - -print Dumper("ShareGetKey", - !defined SambaConfig->ShareGetStr(), - !defined SambaConfig->ShareGetStr("g"), - SambaConfig->ShareGetStr("ro","root","default") eq "/root", - SambaConfig->ShareGetStr("rw","root","default") eq "/dev/zero", - !defined SambaConfig->ShareGetStr("xx","root"), - SambaConfig->ShareGetStr("xx","root","default") eq "default"); - -print Dumper("ShareGetTruth (+inverted synonyms)", - !defined SambaConfig->ShareGetTruth(), - !defined SambaConfig->ShareGetTruth("g"), - !SambaConfig->ShareGetTruth("ro","writable"), - SambaConfig->ShareGetTruth("rw","writable"), - !defined SambaConfig->ShareGetTruth("xx","writable"), - SambaConfig->ShareGetTruth("xx","writable", 1), - SambaConfig->ShareGetTruth("ro","Read Only"), - !SambaConfig->ShareGetTruth("rw","Read Only"), - !SambaConfig->ShareGetTruth("xx","Read Only", 0)); - -print Dumper("ShareGetInt", - !defined SambaConfig->ShareGetInteger(), - !defined SambaConfig->ShareGetInteger("g"), - SambaConfig->ShareGetInteger("ro","int") == 8, - !defined SambaConfig->ShareGetInteger("rw","int"), - SambaConfig->ShareGetInteger("rw","int", 9) == 9); - -print Dumper("ShareSetInt, ShareSetTruth", - !defined SambaConfig->ShareSetTruth(), - !defined SambaConfig->ShareSetInteger("g"), - !SambaConfig->ShareSetInteger("ro","int", 8), - SambaConfig->ShareSetInteger("ro","int", 9), - !SambaConfig->ShareSetTruth("rw","truth"), - SambaConfig->ShareSetTruth("rw","truth", 1), - SambaConfig->ShareSetTruth("rw","truth", 0)); - -print Dumper("Share Enable/Disable/Adjust/Enabled", - !defined SambaConfig->ShareEnable(), - !defined SambaConfig->ShareEnable("xxxxx"), - !defined SambaConfig->ShareDisable(), - !defined SambaConfig->ShareDisable("xxxxx"), - !defined SambaConfig->ShareEnabled(), - !defined SambaConfig->ShareEnabled("xxxxx"), - !SambaConfig->ShareAdjust("ro", 1), - !SambaConfig->ShareAdjust("rw", 0), - SambaConfig->ShareAdjust("rw", 1), - SambaConfig->ShareAdjust("ro", 0), - SambaConfig->ShareEnabled("rw"), - !SambaConfig->ShareEnabled("ro")); - -print Dumper("Share Get/Set/Update Map", - !defined SambaConfig->ShareGetMap(), - !defined SambaConfig->ShareSetMap(), - !defined SambaConfig->ShareUpdateMap(), - SambaConfig->ShareSetMap("home", {a=>"ABC", x=>"XYZ"}), - !SambaConfig->ShareSetMap("home", {a=>"ABC", x=>"XYZ"}), - !SambaConfig->ShareUpdateMap("home", {x=>"123"}), - SambaConfig->ShareUpdateMap("home", {y=>"123"}), - length(%{SambaConfig->ShareGetMap("home")})==3); - - -print Dumper("Share Get/Set Modified", - !defined SambaConfig->ShareGetModified(), - !defined SambaConfig->ShareSetModified(), - !SambaConfig->ShareGetModified("mod"), - SambaConfig->ShareSetModified("mod"), - !SambaConfig->ShareSetModified("mod"), - SambaConfig->ShareGetModified("mod")); - -print Dumper("Share Get/Set Comment", - !defined SambaConfig->ShareGetComment(), - !defined SambaConfig->ShareSetComment(), - !defined SambaConfig->ShareGetComment("mod"), - SambaConfig->ShareSetComment("mod","comment"), - !SambaConfig->ShareSetComment("mod","comment"), - SambaConfig->ShareGetComment("mod") eq "comment"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaNetJoin.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaNetJoin.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaNetJoin.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaNetJoin.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#!/usr/bin/perl - -use SambaNetJoin; -use lib "../src"; use SambaConfig; - -use Data::Dumper; - -## test agent -use YaST::YCP; -YaST::YCP::Import("Testsuite"); -my $e_ok = {target=>{bash_output=>{exit=>0}}}; -my $e_err = {target=>{bash_output=>{exit=>1, stdout=>"fake error"}}}; - -Testsuite->Init([{},{},$e_ok],undef); - -print Dumper( - SambaNetJoin->Test("xxx"), - SambaNetJoin->Test("xxx"), - !SambaNetJoin->Join("xxx")); - -SambaConfig->GlobalSetStr("netbios name", "TUX"); -Testsuite->Init([{},{},$e_err],undef); - -print Dumper( - !SambaNetJoin->Test("tux net"), - SambaNetJoin->Join("tux net", "fake level", "user", "****") eq "fake error"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaNmbLookup.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaNmbLookup.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaNmbLookup.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaNmbLookup.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -#!/usr/bin/perl - -use Data::Dumper; - -use SambaNmbLookup; - -## test agent -use YaST::YCP qw(:DATA); -YaST::YCP::Import("Testsuite"); -my $e_err = {target=>{bash_output=>{exit=>0, stdout=>8}}, background=>{run_output=>0, kill=>1}}; -my $e_ok = {target=>{bash_output=>{exit=>0, stdout=>0}}, background=>{run_output=>1}}; -my $r_running = {background=>{isrunning=>1}}; -my $r_done = {background=>{isrunning=>0, newout=>[ - "WORKGROUP\tDEBIAN_FANS", - "LMB\tGIZO", - "MEMBERS\tGIZO", - "", - "WORKGROUP\tSUPERSONIC", - "PDC\tSATYR", - "DMB\tSATYR", - "LMB\tSATYR", - "MEMBERS\tSATYR", - "", - "WORKGROUP\tTEST", - "BDC\tTEST", -]}}; - -## fake modules -sub PackageSystem::Installed {exists $installed{$_[1]} ? $installed{$_[1]} : 0}; -sub Service::Status {exists $status{$_[1]} ? $status{$_[1]} : -1}; - - -## Start() -%installed = (); -print Dumper(!SambaNmbLookup->Start()); - -%installed = ("samba-client" => 1); -Testsuite->Init([{},{},$e_ok],undef); # run as root, exec nbstatus return ok -print Dumper(SambaNmbLookup->Start()); - -%installed = ("samba-client" => 1, "samba" => 1); -Testsuite->Init([{},{},$e_err],undef); # run as user, exec nbstatus return err -print Dumper(!SambaNmbLookup->Start()); - -%installed = ("samba-client" => 1, "samba" => 1); -$status{"nmb"}=0; # nmb is running -print Dumper(!SambaNmbLookup->Start()); - -%installed = ("samba-client" => 1, "samba" => 1); -$status{"nmb"}=1; # nmb is stopped -print Dumper(!SambaNmbLookup->Start()); - - -## nmbStatus() -$SambaNmbLookup::Nmbstatus_running=0; -SambaNmbLookup->checkNmbstatus(); # nmbstatus not running -print Dumper(SambaNmbLookup->GetAvailableNeighbours()); - -Testsuite->Init([$r_running,{},$e_err],undef); # background process is running -$SambaNmbLookup::Nmbstatus_running=1; -$SambaNmbLookup::wait = 0.4; # wait for 0.4 sec (instead of 120 sec) -SambaNmbLookup->checkNmbstatus(); -print Dumper(SambaNmbLookup->GetAvailableNeighbours()); - -Testsuite->Init([$r_done,{},$e_ok],undef); # background process is finished -$SambaNmbLookup::Nmbstatus_running=1; -SambaNmbLookup->checkNmbstatus(); -print Dumper(SambaNmbLookup->GetAvailableDomains()); - -Testsuite->Init([$r_done,{},$e_ok],undef); # background process is finished -$SambaNmbLookup::Nmbstatus_running=1; -$SambaNmbLookup::Nmbd_was_running=1; -SambaNmbLookup->checkNmbstatus(); -print Dumper(SambaNmbLookup->GetAvailableNeighbours(" (domin)")); - - -## Query funcs() -print Dumper(SambaNmbLookup->Available()); - -print Dumper( - !SambaNmbLookup->IsDomain("xxx"), - SambaNmbLookup->IsDomain("SUPERSONIC"), - SambaNmbLookup->IsDomain("TEST"), - !SambaNmbLookup->IsDomain("GIZO")); - -print Dumper( - !SambaNmbLookup->HasPDC("xxx"), - SambaNmbLookup->HasPDC("SUPERSONIC"), - !SambaNmbLookup->HasPDC("TEST"), - !SambaNmbLookup->HasPDC("GIZO")); - -print Dumper( - !SambaNmbLookup->HasBDC("xxx"), - !SambaNmbLookup->HasBDC("SUPERSONIC"), - SambaNmbLookup->HasBDC("TEST"), - !SambaNmbLookup->HasBDC("GIZO")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaWinbind.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaWinbind.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaWinbind.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaWinbind.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,118 +0,0 @@ -#!/usr/bin/perl - -use SambaWinbind; -use lib "../src"; use SambaConfig; - -use Data::Dumper; - -## fake modules -sub PackageSystem::Installed {$installed{$_[1]}} -sub Service::Enabled {$service_enabled} -sub Service::Status {$service_status} -sub Service::Adjust {print "Service::Adjust($_[1], $_[2])\n"; $service_adjust_return} -sub Service::Start {print "Service::Start($_[1])\n"; $service_start_return} -sub Service::Stop {print "Service::Stop($_[1])\n"; $service_stop_return} -sub Service::Restart {print "Service::Restart($_[1])\n"; $service_restart_return} -sub Nsswitch::WriteDb {print "Nsswitch::WriteDB($_[1], [",join(",",@{$_[2]}),"])\n"} -sub Nsswitch::ReadDb {$nssdb{$_[1]}} -sub Nsswitch::Write {$write} -sub PamSettings::GetValues {$pamdb{$_[2]}} -sub PamSettings::SetValues {print "PamSettings::SetValues($_[1], $_[2], '", join(" ", @{$_[3]}),"')\n"} - - -## IsEnabled() -$installed{"samba-winbind"} = 0; -$service_enabled = 0; -print Dumper(!SambaWinbind->IsEnabled()); - -$installed{"samba-winbind"} = 1; -$service_enabled = 0; -print Dumper(!SambaWinbind->IsEnabled()); - -$installed{"samba-winbind"} = 1; -$service_enabled = 1; -print Dumper(SambaWinbind->IsEnabled()); - - -## AdjustSambaConfig() -SambaWinbind->AdjustSambaConfig(0); -SambaConfig->Dump(); - -SambaWinbind->AdjustSambaConfig(1); -SambaConfig->Dump(); - - -## Adjust Nsswitch() -%nssdb = (passwd => [qw(files winbind nis)], group => [qw(files ldap nis)]); -$write = 1; -SambaWinbind->AdjustNsswitch(0); - -%nssdb = (passwd => [qw(files winbind nis)], group => [qw(files ldap nis)]); -$write = 0; -SambaWinbind->AdjustNsswitch(1); - - -## AdjustPam() -%pamdb = (auth => ["md5","call_modules=files,winbind,nis","nullok"], account => ["md5","call_modules=files,ldap,nis","nullok"]); -SambaWinbind->AdjustPam(0); - -%pamdb = (auth => ["md5","call_modules=files,winbind,nis","nullok"], account => ["md5","call_modules=files,ldap,nis","nullok"]); -SambaWinbind->AdjustPam(1); - -%pamdb = (auth => ["md5","nullok"], account => ["call_modules=winbind"]); -SambaWinbind->AdjustPam(0); - -%pamdb = (auth => ["md5","nullok"], account => ["call_modules=winbind"]); -SambaWinbind->AdjustPam(1); - -%pamdb = (auth => []); -SambaWinbind->AdjustPam(1); - - -## AdjustService() -%installed = ("samba-winbind" => 0); -print Dumper(SambaWinbind->AdjustService(0)); - -%installed = ("samba-winbind" => 0); -print Dumper(!SambaWinbind->AdjustService(1)); - -$service_adjust_return = 1; -%installed = ("samba-winbind" => 1); -print Dumper(SambaWinbind->AdjustService(1)); - -$service_adjust_return = 0; -%installed = ("samba-winbind" => 1); -print Dumper(!SambaWinbind->AdjustService(0)); - - -## StartStopNow() -%installed = ("samba-winbind" => 0); -print Dumper(SambaWinbind->StartStopNow(0)); - -%installed = ("samba-winbind" => 0); -print Dumper(!SambaWinbind->StartStopNow(1)); - -%installed = ("samba-winbind" => 1); -$service_status = 1; -$service_start_return = 1; -print Dumper(SambaWinbind->StartStopNow(1)); -$service_start_return = 0; -print Dumper(!SambaWinbind->StartStopNow(1)); - -%installed = ("samba-winbind" => 1); -$service_status = 0; -$service_restart_return = 1; -print Dumper(SambaWinbind->StartStopNow(1)); -$service_restart_return = 0; -print Dumper(!SambaWinbind->StartStopNow(1)); - -%installed = ("samba-winbind" => 1); -$service_status = 0; -$service_stop_return = 1; -print Dumper(SambaWinbind->StartStopNow(0)); -$service_stop_return = 0; -print Dumper(!SambaWinbind->StartStopNow(0)); - -%installed = ("samba-winbind" => 1); -$service_status = 1; -print Dumper(SambaWinbind->StartStopNow(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 yast2-samba-client for openSUSE:Factory
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at 2013-02-21 10:47:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old) and /work/SRC/openSUSE:Factory/.yast2-samba-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-client", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes 2013-01-20 08:19:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-samba-client.new/yast2-samba-client.changes 2013-02-21 10:47:54.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 20 11:44:33 CET 2013 - jsuchome(a)suse.cz + +- synchronize cluster before restarting CTDB clone service + (bnc#802814) +- force synchronization of smb.conf (bnc#802814) +- do not use hard-coded ctdb resource identifier (bnc#804303) +- 2.23.2 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-2.23.1.tar.bz2 New: ---- yast2-samba-client-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.ZKPYLx/_old 2013-02-21 10:47:56.000000000 +0100 +++ /var/tmp/diff_new_pack.ZKPYLx/_new 2013-02-21 10:47:56.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 2.23.1 +Version: 2.23.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-samba-client-2.23.1.tar.bz2 -> yast2-samba-client-2.23.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/VERSION new/yast2-samba-client-2.23.2/VERSION --- old/yast2-samba-client-2.23.1/VERSION 2013-01-18 10:35:22.000000000 +0100 +++ new/yast2-samba-client-2.23.2/VERSION 2013-02-20 14:41:33.000000000 +0100 @@ -1 +1 @@ -2.23.1 +2.23.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/configure new/yast2-samba-client-2.23.2/configure --- old/yast2-samba-client-2.23.1/configure 2013-01-18 10:43:32.000000000 +0100 +++ new/yast2-samba-client-2.23.2/configure 2013-02-20 14:41:46.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-samba-client 2.23.1. +# Generated by GNU Autoconf 2.69 for yast2-samba-client 2.23.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-samba-client' PACKAGE_TARNAME='yast2-samba-client' -PACKAGE_VERSION='2.23.1' -PACKAGE_STRING='yast2-samba-client 2.23.1' +PACKAGE_VERSION='2.23.2' +PACKAGE_STRING='yast2-samba-client 2.23.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-samba-client 2.23.1 to adapt to many kinds of systems. +\`configure' configures yast2-samba-client 2.23.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-samba-client 2.23.1:";; + short | recursive ) echo "Configuration of yast2-samba-client 2.23.2:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-samba-client configure 2.23.1 +yast2-samba-client configure 2.23.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-samba-client $as_me 2.23.1, which was +It was created by yast2-samba-client $as_me 2.23.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-samba-client' - VERSION='2.23.1' + VERSION='2.23.2' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.23.1" +VERSION="2.23.2" RPMNAME="yast2-samba-client" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -3404,7 +3404,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-samba-client $as_me 2.23.1, which was +This file was extended by yast2-samba-client $as_me 2.23.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-samba-client config.status 2.23.1 +yast2-samba-client config.status 2.23.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/configure.in new/yast2-samba-client-2.23.2/configure.in --- old/yast2-samba-client-2.23.1/configure.in 2013-01-18 10:43:29.000000000 +0100 +++ new/yast2-samba-client-2.23.2/configure.in 2013-02-20 14:41:42.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-client, 2.23.1, http://bugs.opensuse.org/, yast2-samba-client) +AC_INIT(yast2-samba-client, 2.23.2, http://bugs.opensuse.org/, yast2-samba-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.1" +VERSION="2.23.2" RPMNAME="yast2-samba-client" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/src/Samba.ycp new/yast2-samba-client-2.23.2/src/Samba.ycp --- old/yast2-samba-client-2.23.1/src/Samba.ycp 2013-01-18 10:37:00.000000000 +0100 +++ new/yast2-samba-client-2.23.2/src/Samba.ycp 2013-02-20 14:41:33.000000000 +0100 @@ -740,7 +740,16 @@ if (FileUtils::Exists ("/usr/sbin/csync2")) { - map out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -xv"); + // first, force syncing of smb.conf (bnc#802814) + map out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -f /etc/samba/smb.conf"); + if (out["exit"]:0 != 0) + { + y2error ("csync2 failed with %1", out); + return false; + } + + // sync the rest + out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -xv"); if (out["exit"]:0 != 0) { y2error ("csync2 failed with %1", out); @@ -838,8 +847,6 @@ ret = false; } - SambaNetJoin::CleanupCTDB (); - // winbind Progress::NextStage(); if (winbind_enabled && !cluster_present) { @@ -919,9 +926,11 @@ y2warning ("pam-config failed for service %1", service); }); } + if (cluster_present) { SynchronizeCluster (); + SambaNetJoin::CleanupCTDB (); } // finished diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/src/SambaAD.pm new/yast2-samba-client-2.23.2/src/SambaAD.pm --- old/yast2-samba-client-2.23.1/src/SambaAD.pm 2013-01-18 10:37:00.000000000 +0100 +++ new/yast2-samba-client-2.23.2/src/SambaAD.pm 2013-02-20 14:41:33.000000000 +0100 @@ -69,9 +69,9 @@ return $dhcp_client if (defined $dhcp_client) && !$force; my $network = YaPI::NETWORK->Read (); - $dhcp_client = FALSE; + $dhcp_client = TRUE; foreach my $iface (values %{$network->{"interfaces"}}) { - $dhcp_client = $dhcp_client || (($iface->{"bootproto"} || "") =~ m/^dhcp[46]?$/); + $dhcp_client = $dhcp_client && (($iface->{"bootproto"} || "") =~ m/^dhcp[46]?$/); } return $dhcp_client; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/src/SambaNetJoin.pm new/yast2-samba-client-2.23.2/src/SambaNetJoin.pm --- old/yast2-samba-client-2.23.1/src/SambaNetJoin.pm 2013-01-18 10:41:41.000000000 +0100 +++ new/yast2-samba-client-2.23.2/src/SambaNetJoin.pm 2013-02-20 14:41:33.000000000 +0100 @@ -41,10 +41,12 @@ # if DNS should be adapted with AD server my $adapt_dns = FALSE; +# name of base resource +my $rsc_id = ""; + # name of clone resource my $clone_id = ""; - # Helper function to execute crm binary (internal only, not part of API). # Takes all arguments in one string. sub CRMCall { @@ -94,12 +96,12 @@ return FALSE; } - # find out the clone resource id, to do later crm operations with + # find out resource and clone ids, to do later crm operations with my $show = CRMCall ("configure save -"); if ($show =~ /primitive (\w+) ocf:heartbeat:CTDB/) { - my $primitive = $1; - if ($show =~ /clone (.+) $primitive/) { - $clone_id = $1; + $rsc_id = $1; + if ($show =~ /clone (.+) $rsc_id/) { + $clone_id = $1; } } @@ -159,7 +161,7 @@ # 3. Run crm configure edit and search for the ctdb resource. Add the following line: # ctdb_manages_winbind="false" - CRMCall ("resource param ctdb set ctdb_manages_winbind no"); + CRMCall ("resource param $rsc_id set ctdb_manages_winbind no"); # 4. save winbind into /etc/nsswitch.conf # 5. Restart the NSC daemon: @@ -200,7 +202,7 @@ CRMCall ("resource stop $clone_id"); # b. Change the value from false to true: ctdb_manages_winbind="true" - CRMCall ("resource param ctdb set ctdb_manages_winbind yes"); + CRMCall ("resource param $rsc_id set ctdb_manages_winbind yes"); # c. Restart the ctdb resource: CRMCall ("resource start $clone_id"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/Makefile.am new/yast2-samba-client-2.23.2/testsuite/Makefile.am --- old/yast2-samba-client-2.23.1/testsuite/Makefile.am 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/Makefile.am 2013-02-20 14:41:33.000000000 +0100 @@ -5,7 +5,7 @@ # AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.pl) $(wildcard tests/*.pm) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/Makefile.in new/yast2-samba-client-2.23.2/testsuite/Makefile.in --- old/yast2-samba-client-2.23.1/testsuite/Makefile.in 2013-01-18 10:43:34.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/Makefile.in 2013-02-20 14:41:47.000000000 +0100 @@ -195,7 +195,7 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.pl) $(wildcard tests/*.pm) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.out new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.out --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.out 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.out 2013-02-20 14:41:33.000000000 +0100 @@ -1,24 +1,3 @@ -dump1: [_internal] -dump1: abc = ABC -dump1: -dump1: [a] -dump1: Bee Bee = x -dump1: _comment = A -dump1: _disabled = 1 -dump1: _modified = 1 -dump1: _xxx = 8 -dump1: -dump1: [b] -dump1: Two Two = 22 -dump1: no = <undefined> -dump1: -dump1: [removed] - -dump2: [a] -dump2: _comment = A -dump2: _disabled = 1 -dump2: bee bee = x -dump2: -dump2: [b] -dump2: two two = 22 - +Dump $["_internal":$["abc":"ABC"], "a":$["Bee Bee":"x", "_comment":"A", "_disabled":true, "_modified":true, "_xxx":8], "b":$["Two Two":22, "no":nil], "removed":nil] +Return nil +Return [$["comment":"A", "disabled":true, "name":"a", "parameters":$["bee_bee":"x"]], $["name":"b", "parameters":$["two_two":"22"]]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -#!/usr/bin/perl - -use strict; - -use SambaConfig; -use Data::Dumper; - -## test Get/Set Modified -SambaConfig->Import({ - a=>{"Bee Bee"=>"x", _modified=>1, _disabled=>1, _xxx=>8, _comment=>"A"}, - _internal=>{abc=>"ABC"}, - removed=>undef, - b=>{no=>undef, "Two Two"=>22}}); -SambaConfig->Dump("dump1: "); - -my $dump = SambaConfig->Export(); -#print Dumper($dump); - -SambaConfig->Import($dump); -SambaConfig->Dump("dump2: "); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.ycp new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.ycp --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ExportImport.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ExportImport.ycp 2013-02-20 14:41:33.000000000 +0100 @@ -0,0 +1,32 @@ +/** + * test SambaConfig::Export: + * should remove modified flags and internal shares from config + */ +{ + import "Testsuite"; + import "SambaConfig"; + + map i = $[ + "a" : $[ + "Bee Bee" : "x", + "_modified" : true, + "_disabled" : true, + "_xxx" : 8, + "_comment" : "A" + ], + "_internal" : $[ + "abc" : "ABC" + ], + "removed" : nil, + "b" : $[ + "no" : nil, + "Two Two" : 22 + ] + ]; + + Testsuite::Dump (i); + + Testsuite::Test(``(SambaConfig::Import (i)), [ $[], $[], $[] ], 0); + + Testsuite::Test (``(SambaConfig::Export ()), [], 0); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_Global.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_Global.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_Global.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_Global.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -#!/usr/bin/perl - -use SambaConfig; -use Data::Dumper; - -# test Configured -print Dumper(SambaConfig->Configured()); -SambaConfig->Import({a=>{b=>"x"}}); -print Dumper(SambaConfig->Configured()); - -# test Get/Set Modified -print Dumper(SambaConfig->GetModified()); -SambaConfig->SetModified(); -print Dumper(SambaConfig->GetModified()); - -# test GetShares -print Dumper(SambaConfig->GetShares()); - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ReadWrite.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ReadWrite.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_ReadWrite.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_ReadWrite.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -#!/usr/bin/perl - -use SambaConfig; -use Data::Dumper; - -$smb_conf = "/etc/samba/smb.conf"; -$smb_conf_bak = "/tmp/smb.conf"; -die "no permision to write to $smb_conf" unless -w $smb_conf; - -# backup smb.conf -if ( -f $smb_conf && not -f $smb_conf_bak ) { - open(SMB, "<", $smb_conf) or die $!; - open(BAK, ">", $smb_conf_bak) or die $!; - print BAK <SMB>; - close BAK; close SMB; -} -# truncate smb.conf -open(SMB, ">", $smb_conf) or die $!; close SMB; - -# no write -SambaConfig->Import({ - a => {b=>"y"}, - home => {path=>"/dev", _modified=>1}, - global => {x=>"y"}}); -SambaConfig->Write(); -SambaConfig->Import(); -SambaConfig->Read(); -SambaConfig->Dump(); - -# normal write -SambaConfig->Import({ - a => {b=>"y", _modified=>1}, - home => {path=>"/dev", _modified=>1}, - global => {_modified=>1, abc=>"ABC"}}); -SambaConfig->ShareRemove("home"); -SambaConfig->Write(); -SambaConfig->Import(); -SambaConfig->Read(); -SambaConfig->Dump(); - -# write disabled share -SambaConfig->Import({ - a => {b=>undef, c=>"z", _modified=>1, _disabled=>1}, - global => {_modified=>1, abc=>undef, def=>"DEF"}}); -SambaConfig->Write(); -SambaConfig->Import(); -SambaConfig->Read(); -SambaConfig->Dump(); - -# write (force) share with comment -SambaConfig->Import({ - a => {c=>"q",_disabled=>1,_comment=>"share disabled by gizo"}, - _my => {my=>1}, - global => {ghc=>"GHC"}}); -SambaConfig->Write(1); -SambaConfig->Import(); -SambaConfig->Read(); -SambaConfig->Dump(); - -# restore smb.conf -open(SMB, ">", $smb_conf) or die $!; -open(BAK, "<", $smb_conf_bak) or die $!; -print SMB <BAK>; -close BAK; close SMB; - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_Share.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_Share.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaConfig_Share.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaConfig_Share.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,120 +0,0 @@ -#!/usr/bin/perl - -use SambaConfig; -use Data::Dumper; - -# test general shares - -SambaConfig->Import( -{ - a=>{x=>"y"}, - b=>{u=>"v", _internal=>"xxx", no=>undef}, - ro=>{"read only"=>"Yes", "root directory"=>"/root", int=>8}, - rw=>{"read only"=>"No", "root directory"=>"/dev/zero", _disabled=>1}, -}); - -print Dumper("ShareRemove", - !defined SambaConfig->ShareRemove(), - SambaConfig->ShareRemove("a"), - !SambaConfig->ShareRemove("a")); - -print Dumper("ShareExists", - !defined SambaConfig->ShareExists(), - !SambaConfig->ShareExists("a"), - SambaConfig->ShareExists("b")); - -print Dumper("ShareKeys", - !defined SambaConfig->ShareKeys(), - $#{SambaConfig->ShareKeys("a")}==-1, - $#{SambaConfig->ShareKeys("b")}==0); - -print Dumper("ShareSetStr", - !defined SambaConfig->ShareSetStr(), - !defined SambaConfig->ShareSetStr("g"), - SambaConfig->ShareSetStr("g","My Key", "My Val"), - !SambaConfig->ShareSetStr("g","Lock Dir"), - SambaConfig->ShareSetStr("g","Lock Dir", "/dev"), - SambaConfig->ShareSetStr("g","Lock Dir", "/home"), - !SambaConfig->ShareSetStr("g","Lock Dir", "/home"), - SambaConfig->ShareSetStr("g","Lock Dir"), - !SambaConfig->ShareSetStr("g","writable"), - SambaConfig->ShareSetStr("g","writable", 1), - !SambaConfig->ShareSetStr("g","writable", 1), - SambaConfig->ShareSetStr("g","writable", 0), - SambaConfig->ShareSetStr("g","writable")); - -print Dumper("ShareGetKey", - !defined SambaConfig->ShareGetStr(), - !defined SambaConfig->ShareGetStr("g"), - SambaConfig->ShareGetStr("ro","root","default") eq "/root", - SambaConfig->ShareGetStr("rw","root","default") eq "/dev/zero", - !defined SambaConfig->ShareGetStr("xx","root"), - SambaConfig->ShareGetStr("xx","root","default") eq "default"); - -print Dumper("ShareGetTruth (+inverted synonyms)", - !defined SambaConfig->ShareGetTruth(), - !defined SambaConfig->ShareGetTruth("g"), - !SambaConfig->ShareGetTruth("ro","writable"), - SambaConfig->ShareGetTruth("rw","writable"), - !defined SambaConfig->ShareGetTruth("xx","writable"), - SambaConfig->ShareGetTruth("xx","writable", 1), - SambaConfig->ShareGetTruth("ro","Read Only"), - !SambaConfig->ShareGetTruth("rw","Read Only"), - !SambaConfig->ShareGetTruth("xx","Read Only", 0)); - -print Dumper("ShareGetInt", - !defined SambaConfig->ShareGetInteger(), - !defined SambaConfig->ShareGetInteger("g"), - SambaConfig->ShareGetInteger("ro","int") == 8, - !defined SambaConfig->ShareGetInteger("rw","int"), - SambaConfig->ShareGetInteger("rw","int", 9) == 9); - -print Dumper("ShareSetInt, ShareSetTruth", - !defined SambaConfig->ShareSetTruth(), - !defined SambaConfig->ShareSetInteger("g"), - !SambaConfig->ShareSetInteger("ro","int", 8), - SambaConfig->ShareSetInteger("ro","int", 9), - !SambaConfig->ShareSetTruth("rw","truth"), - SambaConfig->ShareSetTruth("rw","truth", 1), - SambaConfig->ShareSetTruth("rw","truth", 0)); - -print Dumper("Share Enable/Disable/Adjust/Enabled", - !defined SambaConfig->ShareEnable(), - !defined SambaConfig->ShareEnable("xxxxx"), - !defined SambaConfig->ShareDisable(), - !defined SambaConfig->ShareDisable("xxxxx"), - !defined SambaConfig->ShareEnabled(), - !defined SambaConfig->ShareEnabled("xxxxx"), - !SambaConfig->ShareAdjust("ro", 1), - !SambaConfig->ShareAdjust("rw", 0), - SambaConfig->ShareAdjust("rw", 1), - SambaConfig->ShareAdjust("ro", 0), - SambaConfig->ShareEnabled("rw"), - !SambaConfig->ShareEnabled("ro")); - -print Dumper("Share Get/Set/Update Map", - !defined SambaConfig->ShareGetMap(), - !defined SambaConfig->ShareSetMap(), - !defined SambaConfig->ShareUpdateMap(), - SambaConfig->ShareSetMap("home", {a=>"ABC", x=>"XYZ"}), - !SambaConfig->ShareSetMap("home", {a=>"ABC", x=>"XYZ"}), - !SambaConfig->ShareUpdateMap("home", {x=>"123"}), - SambaConfig->ShareUpdateMap("home", {y=>"123"}), - length(%{SambaConfig->ShareGetMap("home")})==3); - - -print Dumper("Share Get/Set Modified", - !defined SambaConfig->ShareGetModified(), - !defined SambaConfig->ShareSetModified(), - !SambaConfig->ShareGetModified("mod"), - SambaConfig->ShareSetModified("mod"), - !SambaConfig->ShareSetModified("mod"), - SambaConfig->ShareGetModified("mod")); - -print Dumper("Share Get/Set Comment", - !defined SambaConfig->ShareGetComment(), - !defined SambaConfig->ShareSetComment(), - !defined SambaConfig->ShareGetComment("mod"), - SambaConfig->ShareSetComment("mod","comment"), - !SambaConfig->ShareSetComment("mod","comment"), - SambaConfig->ShareGetComment("mod") eq "comment"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaNetJoin.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaNetJoin.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaNetJoin.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaNetJoin.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#!/usr/bin/perl - -use SambaNetJoin; -use lib "../src"; use SambaConfig; - -use Data::Dumper; - -## test agent -use YaST::YCP; -YaST::YCP::Import("Testsuite"); -my $e_ok = {target=>{bash_output=>{exit=>0}}}; -my $e_err = {target=>{bash_output=>{exit=>1, stdout=>"fake error"}}}; - -Testsuite->Init([{},{},$e_ok],undef); - -print Dumper( - SambaNetJoin->Test("xxx"), - SambaNetJoin->Test("xxx"), - !SambaNetJoin->Join("xxx")); - -SambaConfig->GlobalSetStr("netbios name", "TUX"); -Testsuite->Init([{},{},$e_err],undef); - -print Dumper( - !SambaNetJoin->Test("tux net"), - SambaNetJoin->Join("tux net", "fake level", "user", "****") eq "fake error"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaNmbLookup.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaNmbLookup.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaNmbLookup.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaNmbLookup.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -#!/usr/bin/perl - -use Data::Dumper; - -use SambaNmbLookup; - -## test agent -use YaST::YCP qw(:DATA); -YaST::YCP::Import("Testsuite"); -my $e_err = {target=>{bash_output=>{exit=>0, stdout=>8}}, background=>{run_output=>0, kill=>1}}; -my $e_ok = {target=>{bash_output=>{exit=>0, stdout=>0}}, background=>{run_output=>1}}; -my $r_running = {background=>{isrunning=>1}}; -my $r_done = {background=>{isrunning=>0, newout=>[ - "WORKGROUP\tDEBIAN_FANS", - "LMB\tGIZO", - "MEMBERS\tGIZO", - "", - "WORKGROUP\tSUPERSONIC", - "PDC\tSATYR", - "DMB\tSATYR", - "LMB\tSATYR", - "MEMBERS\tSATYR", - "", - "WORKGROUP\tTEST", - "BDC\tTEST", -]}}; - -## fake modules -sub PackageSystem::Installed {exists $installed{$_[1]} ? $installed{$_[1]} : 0}; -sub Service::Status {exists $status{$_[1]} ? $status{$_[1]} : -1}; - - -## Start() -%installed = (); -print Dumper(!SambaNmbLookup->Start()); - -%installed = ("samba-client" => 1); -Testsuite->Init([{},{},$e_ok],undef); # run as root, exec nbstatus return ok -print Dumper(SambaNmbLookup->Start()); - -%installed = ("samba-client" => 1, "samba" => 1); -Testsuite->Init([{},{},$e_err],undef); # run as user, exec nbstatus return err -print Dumper(!SambaNmbLookup->Start()); - -%installed = ("samba-client" => 1, "samba" => 1); -$status{"nmb"}=0; # nmb is running -print Dumper(!SambaNmbLookup->Start()); - -%installed = ("samba-client" => 1, "samba" => 1); -$status{"nmb"}=1; # nmb is stopped -print Dumper(!SambaNmbLookup->Start()); - - -## nmbStatus() -$SambaNmbLookup::Nmbstatus_running=0; -SambaNmbLookup->checkNmbstatus(); # nmbstatus not running -print Dumper(SambaNmbLookup->GetAvailableNeighbours()); - -Testsuite->Init([$r_running,{},$e_err],undef); # background process is running -$SambaNmbLookup::Nmbstatus_running=1; -$SambaNmbLookup::wait = 0.4; # wait for 0.4 sec (instead of 120 sec) -SambaNmbLookup->checkNmbstatus(); -print Dumper(SambaNmbLookup->GetAvailableNeighbours()); - -Testsuite->Init([$r_done,{},$e_ok],undef); # background process is finished -$SambaNmbLookup::Nmbstatus_running=1; -SambaNmbLookup->checkNmbstatus(); -print Dumper(SambaNmbLookup->GetAvailableDomains()); - -Testsuite->Init([$r_done,{},$e_ok],undef); # background process is finished -$SambaNmbLookup::Nmbstatus_running=1; -$SambaNmbLookup::Nmbd_was_running=1; -SambaNmbLookup->checkNmbstatus(); -print Dumper(SambaNmbLookup->GetAvailableNeighbours(" (domin)")); - - -## Query funcs() -print Dumper(SambaNmbLookup->Available()); - -print Dumper( - !SambaNmbLookup->IsDomain("xxx"), - SambaNmbLookup->IsDomain("SUPERSONIC"), - SambaNmbLookup->IsDomain("TEST"), - !SambaNmbLookup->IsDomain("GIZO")); - -print Dumper( - !SambaNmbLookup->HasPDC("xxx"), - SambaNmbLookup->HasPDC("SUPERSONIC"), - !SambaNmbLookup->HasPDC("TEST"), - !SambaNmbLookup->HasPDC("GIZO")); - -print Dumper( - !SambaNmbLookup->HasBDC("xxx"), - !SambaNmbLookup->HasBDC("SUPERSONIC"), - SambaNmbLookup->HasBDC("TEST"), - !SambaNmbLookup->HasBDC("GIZO")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.1/testsuite/tests/SambaWinbind.pl new/yast2-samba-client-2.23.2/testsuite/tests/SambaWinbind.pl --- old/yast2-samba-client-2.23.1/testsuite/tests/SambaWinbind.pl 2013-01-07 15:19:07.000000000 +0100 +++ new/yast2-samba-client-2.23.2/testsuite/tests/SambaWinbind.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,118 +0,0 @@ -#!/usr/bin/perl - -use SambaWinbind; -use lib "../src"; use SambaConfig; - -use Data::Dumper; - -## fake modules -sub PackageSystem::Installed {$installed{$_[1]}} -sub Service::Enabled {$service_enabled} -sub Service::Status {$service_status} -sub Service::Adjust {print "Service::Adjust($_[1], $_[2])\n"; $service_adjust_return} -sub Service::Start {print "Service::Start($_[1])\n"; $service_start_return} -sub Service::Stop {print "Service::Stop($_[1])\n"; $service_stop_return} -sub Service::Restart {print "Service::Restart($_[1])\n"; $service_restart_return} -sub Nsswitch::WriteDb {print "Nsswitch::WriteDB($_[1], [",join(",",@{$_[2]}),"])\n"} -sub Nsswitch::ReadDb {$nssdb{$_[1]}} -sub Nsswitch::Write {$write} -sub PamSettings::GetValues {$pamdb{$_[2]}} -sub PamSettings::SetValues {print "PamSettings::SetValues($_[1], $_[2], '", join(" ", @{$_[3]}),"')\n"} - - -## IsEnabled() -$installed{"samba-winbind"} = 0; -$service_enabled = 0; -print Dumper(!SambaWinbind->IsEnabled()); - -$installed{"samba-winbind"} = 1; -$service_enabled = 0; -print Dumper(!SambaWinbind->IsEnabled()); - -$installed{"samba-winbind"} = 1; -$service_enabled = 1; -print Dumper(SambaWinbind->IsEnabled()); - - -## AdjustSambaConfig() -SambaWinbind->AdjustSambaConfig(0); -SambaConfig->Dump(); - -SambaWinbind->AdjustSambaConfig(1); -SambaConfig->Dump(); - - -## Adjust Nsswitch() -%nssdb = (passwd => [qw(files winbind nis)], group => [qw(files ldap nis)]); -$write = 1; -SambaWinbind->AdjustNsswitch(0); - -%nssdb = (passwd => [qw(files winbind nis)], group => [qw(files ldap nis)]); -$write = 0; -SambaWinbind->AdjustNsswitch(1); - - -## AdjustPam() -%pamdb = (auth => ["md5","call_modules=files,winbind,nis","nullok"], account => ["md5","call_modules=files,ldap,nis","nullok"]); -SambaWinbind->AdjustPam(0); - -%pamdb = (auth => ["md5","call_modules=files,winbind,nis","nullok"], account => ["md5","call_modules=files,ldap,nis","nullok"]); -SambaWinbind->AdjustPam(1); - -%pamdb = (auth => ["md5","nullok"], account => ["call_modules=winbind"]); -SambaWinbind->AdjustPam(0); - -%pamdb = (auth => ["md5","nullok"], account => ["call_modules=winbind"]); -SambaWinbind->AdjustPam(1); - -%pamdb = (auth => []); -SambaWinbind->AdjustPam(1); - - -## AdjustService() -%installed = ("samba-winbind" => 0); -print Dumper(SambaWinbind->AdjustService(0)); - -%installed = ("samba-winbind" => 0); -print Dumper(!SambaWinbind->AdjustService(1)); - -$service_adjust_return = 1; -%installed = ("samba-winbind" => 1); -print Dumper(SambaWinbind->AdjustService(1)); - -$service_adjust_return = 0; -%installed = ("samba-winbind" => 1); -print Dumper(!SambaWinbind->AdjustService(0)); - - -## StartStopNow() -%installed = ("samba-winbind" => 0); -print Dumper(SambaWinbind->StartStopNow(0)); - -%installed = ("samba-winbind" => 0); -print Dumper(!SambaWinbind->StartStopNow(1)); - -%installed = ("samba-winbind" => 1); -$service_status = 1; -$service_start_return = 1; -print Dumper(SambaWinbind->StartStopNow(1)); -$service_start_return = 0; -print Dumper(!SambaWinbind->StartStopNow(1)); - -%installed = ("samba-winbind" => 1); -$service_status = 0; -$service_restart_return = 1; -print Dumper(SambaWinbind->StartStopNow(1)); -$service_restart_return = 0; -print Dumper(!SambaWinbind->StartStopNow(1)); - -%installed = ("samba-winbind" => 1); -$service_status = 0; -$service_stop_return = 1; -print Dumper(SambaWinbind->StartStopNow(0)); -$service_stop_return = 0; -print Dumper(!SambaWinbind->StartStopNow(0)); - -%installed = ("samba-winbind" => 1); -$service_status = 1; -print Dumper(SambaWinbind->StartStopNow(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 xorg-x11-server for openSUSE:12.3
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:12.3 checked in at 2013-02-21 10:46:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/xorg-x11-server (Old) and /work/SRC/openSUSE:12.3/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/xorg-x11-server/xorg-x11-server.changes 2013-02-01 16:16:01.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.xorg-x11-server.new/xorg-x11-server.changes 2013-02-21 10:46:52.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 20 13:36:40 UTC 2013 - sndirsch(a)suse.com + +- added u_init_framebuffer_base.patch: initialize buffer.base to fix + Xorg segfault in virtualbox guest (bnc#799480) + +------------------------------------------------------------------- New: ---- u_init_framebuffer_base.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.mz8FgJ/_old 2013-02-21 10:46:53.000000000 +0100 +++ /var/tmp/diff_new_pack.mz8FgJ/_new 2013-02-21 10:46:53.000000000 +0100 @@ -177,6 +177,7 @@ Patch222: N_sync-fix.patch Patch225: u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch Patch226: u_vgaHW-no-legacy.patch +Patch227: u_init_framebuffer_base.patch %description This package contains the X.Org Server. @@ -295,6 +296,7 @@ #%patch222 -p1 %patch225 -p1 %patch226 -p0 +%patch227 -p1 %build autoreconf -fi ++++++ u_init_framebuffer_base.patch ++++++ Index: xorg-server-1.13.2/glx/glxdri.c =================================================================== --- xorg-server-1.13.2/glx/glxdri.c +++ xorg-server-1.13.2/glx/glxdri.c @@ -971,13 +971,15 @@ __glXDRIscreenProbe(ScreenPtr pScreen) size_t buffer_size; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + framebuffer.base = NULL; + if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { LogMessage(X_INFO, "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum); return NULL; } - + screen = calloc(1, sizeof *screen); if (screen == NULL) return 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 xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2013-02-21 10:46:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2013-02-01 16:15:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2013-02-21 10:46:43.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 20 13:36:40 UTC 2013 - sndirsch(a)suse.com + +- added u_init_framebuffer_base.patch: initialize buffer.base to fix + Xorg segfault in virtualbox guest (bnc#799480) + +------------------------------------------------------------------- New: ---- u_init_framebuffer_base.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.WwsDK3/_old 2013-02-21 10:46:46.000000000 +0100 +++ /var/tmp/diff_new_pack.WwsDK3/_new 2013-02-21 10:46:46.000000000 +0100 @@ -177,6 +177,7 @@ Patch222: N_sync-fix.patch Patch225: u_Do-not-use-intel-driver-on-Poulsbo-Oaktrail-Medfield.patch Patch226: u_vgaHW-no-legacy.patch +Patch227: u_init_framebuffer_base.patch %description This package contains the X.Org Server. @@ -295,6 +296,7 @@ #%patch222 -p1 %patch225 -p1 %patch226 -p0 +%patch227 -p1 %build autoreconf -fi ++++++ u_init_framebuffer_base.patch ++++++ Index: xorg-server-1.13.2/glx/glxdri.c =================================================================== --- xorg-server-1.13.2/glx/glxdri.c +++ xorg-server-1.13.2/glx/glxdri.c @@ -971,13 +971,15 @@ __glXDRIscreenProbe(ScreenPtr pScreen) size_t buffer_size; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + framebuffer.base = NULL; + if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { LogMessage(X_INFO, "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum); return NULL; } - + screen = calloc(1, sizeof *screen); if (screen == NULL) return 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 supertuxkart for openSUSE:Factory
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package supertuxkart for openSUSE:Factory checked in at 2013-02-21 10:46:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supertuxkart (Old) and /work/SRC/openSUSE:Factory/.supertuxkart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "supertuxkart", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-09 11:18:20.872010756 +0100 +++ /work/SRC/openSUSE:Factory/.supertuxkart.new/supertuxkart.changes 2013-02-21 10:46:15.000000000 +0100 @@ -0,0 +1,273 @@ +------------------------------------------------------------------- +Wed Feb 20 16:21:05 UTC 2013 - cfarrell(a)suse.com + +- License update: GPL-2.0+ and GPL-3.0+ and CC-BY-SA-3.0 + Based on audit of 0.8. + +------------------------------------------------------------------- +Fri Jan 4 13:51:36 UTC 2013 - dimstar(a)opensuse.org + +- Correct supertuxkart-desktop.patch: the fix did not really work + (bnc#794681). + +------------------------------------------------------------------- +Wed Dec 26 11:08:26 UTC 2012 - joop.boonen(a)opensuse.org + +- openal-devel is now called openal-soft-devel + +------------------------------------------------------------------- +Sat Dec 15 20:58:22 UTC 2012 - dimstar(a)opensuse.org + +- Add supertuxkart-desktop.patch: Fix path to supertuxkart in + .desktop file (bnc#794681). + +------------------------------------------------------------------- +Tue Dec 11 23:30:04 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 0.8: + + Story mode and new challenge set. + + Improved AI. + + Skidding and better collision physics. + + Reverse mode. + + New green valley track. + + New Blackhill Mansion track. + + Updated XR591 track. + + Updated Fort Magma track. + + Updated Jungle track. + + Updated Sand track. + + New music. + + Updated menus. +- Drop automake buildrequires: no need to bootstrap; +- Drop Irrlicht-devel BuildRequires: we must build with the + internal, statically linked Irrlicht, or we will see graphic + glitches. +- Drop supertuxkart-pthread.patch: fixed upstream. +- Add cmake BuildRequires: build system was ported to cmake. +- Add fribidi-devel BuildRequires: needed for RTL texts. +- Add pkgconfig(gl) BuildRequires: new dependency (for Irrlicht). + +------------------------------------------------------------------- +Tue May 1 22:28:40 UTC 2012 - joop.boonen(a)opensuse.org + +- Corrected links is now hosted on sourceforge +- Added missing BuildRequires automake + +------------------------------------------------------------------- +Mon Nov 14 21:34:47 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 0.7.3: + + New Minigolf track + + New Zen Garden track + + New Subsea track + + New Island battle arena + + New Suzanne kart + + New graphical effects + + New weapons 'Swatter' and 'Rubber Ball' + + Added Thunderbird as race referee + + 3 Strikes Battles now displays lives as spare tires + + Improved bubble gum + + See progression during Grand Prix + + Improve physics for tall karts (e.g. Adiumy) + + Lots of bug fixes + + Improved kart control at high speeds + + Better placement of rescued karts + + Transition track-making to blender 2.5/2.6 +- Hack in the .spec to drop files that get unintentionally + installed (reported to upstream). +- Add: supertuxkart-pthread.patch: Link against pthread when. + +------------------------------------------------------------------- +Tue Sep 27 13:25:09 UTC 2011 - prusnak(a)opensuse.org + +- add Geeko kart add-on by default +- split data files to separate noarch package + +------------------------------------------------------------------- +Sat Jul 16 20:49:26 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 0.7.2: + + In-game addon manager + + Fixed major memory leaks + + New Snow Peak track by Samuncle + + Improved star track UFO by Rudy + + New Beastie kart. + + Show when you get a highscore + + Improve gamepad configuration under Windows (add ability to + tell gamepads apart) + + Various other tweaks done and glitches fixed. + +------------------------------------------------------------------- +Mon Apr 25 19:29:32 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 0.7.1b: + + Fixes a nasty bug stopping you from finishing a challenge. + +------------------------------------------------------------------- +Fri Apr 15 21:17:36 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 0.7.1: + + Particle (smoke, splash, fire) and weather effects + + New Fort Magma by Samuncle, new Shiny Suburbs track by Horace + + New Beagle kart by wolterh, new Emule kart by Kinsu + + Added internet news + + Support for live language switch + + Added optional minimal race UI + + Temporary invincibility after being hit + + Added support for full-screen anti-aliasing + + Clearer multiplayer setup + + Renamed many tracks to nicer names + + Basic level-of-detail (LOD) support + + Debug features for track makers + + Update to bullet 2.77 + + Replace more sounds to be DFSG-compliant + + Fixed character names that contain non-ASCII characters + + Full RTL (right to left) support + + Various other tweaks done and glitches fixed + +------------------------------------------------------------------- +Tue Dec 21 23:27:43 UTC 2010 - dimstar(a)opensuse.org + +- Reword the description together with upstream. + +------------------------------------------------------------------- +Tue Dec 21 18:53:11 UTC 2010 - dimstar(a)opensuse.org + +- Upgrade to version 0.7, final release: + + new GUI + + kart and track animations + + new and improved tracks, karts, and items + + shortcut/alternative way support for tracks + + Asian fonts + + many many bugfixes. + +------------------------------------------------------------------- +Sat Dec 18 15:23:30 UTC 2010 - dimstar(a)opensuse.org + +- Upgrade to version 0.7 release candidate 2: + + Complete rewrite, using the irrlich game engine. + +------------------------------------------------------------------- +Fri Mar 12 20:54:25 UTC 2010 - dimstar(a)opensuse.org + +- Add stk-bufferoverflow.patch to fix a bufferoverflow. + +------------------------------------------------------------------- +Thu Sep 3 17:36:19 CEST 2009 - dimstar(a)opensuse.org + +- Update to version 0.6.2 + + Bugfix: battle mode would not display track groups. +- Add stk-am111.patch to fix installation with automake 1.11. +- Add stk-asneeded to build linking with -as-needed. + +------------------------------------------------------------------- +Wed Feb 18 12:40:00 CET 2009 - dominique-rpm(a)leuenberger.net + +- Release 0.6.1 + some ninor bugfixes, a new battle map, a new kart and better + support for Addons. + +------------------------------------------------------------------- +Thu Jan 22 10:14:00 CET 2009 - dominique-rpm(a)leuenberger.net + +- Release 0.6 +* New improved physics and kart handling +* Added sharp turns and nitro speed boost (replacing wheelies and jump) +* Totally rewrote powerups (plunger, bowling ball, cake, bubblegum) and new look for bananas +* New and improved tracks : skyline, snow mountain, race track, space track, old mine, XR591 +* New game mode : 3-Strikes Battle +* Major improvements to AI +* New/improved karts (and removed some old ones) : wilber, eviltux, hexley +* Improved user interface +* Karts now have a visible suspension effect +* Fully positional audio with OpenAL +* New music and sound effects (including engine, braking and skidding sounds) +* Better support for mods and add-ons (kart and track groups) +* New/updated translations (ga fi de nl sl fr it es ro sv) +* Allowed 'Grand Prix's of Time Trial, Follow the Leader, or any other mode +* Challenges are now specified and config files, and are thus easy to create by users +* Improved build system to better detect missing dependencies +* Improved shortcut-detection +* Initial work towards networking (disabled and hidden by default) +* Bug fixes and code refactor/cleanup/documentation + - Fixed 'joystick locks' (kart would turn even if the joystick is in neutral), + thanks to Samjam for the patch. + +------------------------------------------------------------------- +Mon Jun 2 20:39:00 EEST 2008 - Dominique Leuenberger <dominique-obs(a)leuenberger.net> + ++++ 76 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.supertuxkart.new/supertuxkart.changes New: ---- 14e6ba25b17f0d.zip supertuxkart-0.8-src.tar.bz2 supertuxkart-desktop.patch supertuxkart.changes supertuxkart.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supertuxkart.spec ++++++ # # spec file for package supertuxkart # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: supertuxkart Version: 0.8 Release: 0 Summary: A 3D kart racing game License: GPL-2.0+ and GPL-3.0+ and CC-BY-SA-3.0 Group: Amusements/Games/3D/Race Url: http://supertuxkart.sourceforge.net/ Source: http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/%{version}/… # Geeko kart add-on (CC-BY 3.0) Source1: http://stkaddons.net/dl/14e6ba25b17f0d.zip # PATCH-FIX-UPSTREAM supertuxkart-desktop.patch dimstar(a)opensuse.org -- Fix exec path in supertuxkart.desktop, taken from upstream svn. Patch0: supertuxkart-desktop.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: fribidi-devel BuildRequires: gcc-c++ BuildRequires: libogg-devel %if 0%{?suse_version} <= 1220 BuildRequires: libopenal1 %endif BuildRequires: libvorbis-devel BuildRequires: openal-soft-devel BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: pkgconfig(gl) Requires: %{name}-data = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description SuperTuxKart is a Free 3d kart racing game. The focus of the game is more to be fun than it is to be realistic. You can play with up to 4 friends on one PC, racing against each other or just try to beat the computer. See the great lighthouse or drive through the sand and visit the pyramids. Race underground or in space, watching the stars passing by. Have some rest under the palms on the beach (watching the other karts overtaking you :) ). But don't eat the bananas! Watch for bowling balls, plungers, bubble gum and cakes thrown by opponents. You can do a single race against other karts, compete in one of several Grand Prix, try to beat the high score in time trials on your own, play battle mode against your friends, and more! %package data Summary: Data files for SuperTuxKart Group: Amusements/Games/3D/Race Requires: %{name} = %{version} BuildArch: noarch %description data Data files for SuperTuxKart a Free 3d kart racing game. %prep %setup -q -n SuperTuxKart-%{version} %patch0 -p2 %build # We need an internal version of Irrlicht... pushd lib/irrlicht/source/Irrlicht NDEBUG=1 make %{?_smp_mflags} popd mkdir cmake_build cd cmake_build cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .. make %{?_smp_mflags} VERBOSE=1 %install cd cmake_build make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/supertuxkart/data/karts/geeko/ cd %{buildroot}%{_datadir}/supertuxkart/data/karts/geeko/ unzip %{SOURCE1} %fdupes %{buildroot}%{_datadir} %suse_update_desktop_file supertuxkart %files %defattr(-,root,root) %doc AUTHORS COPYING README TODO ChangeLog %{_bindir}/supertuxkart %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}_*.xpm %files data %defattr(-,root,root) %{_datadir}/supertuxkart/ %changelog ++++++ supertuxkart-desktop.patch ++++++ --- main/trunk/data/supertuxkart_desktop.template 2012/12/13 02:23:14 12275 +++ main/trunk/data/supertuxkart_desktop.template 2012/12/13 20:23:26 12276 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=SuperTuxKart Icon=@PREFIX@/share/pixmaps/supertuxkart_64.xpm GenericName=A kart racing game @@ -7,9 +6,9 @@ GenericName[fr_FR]=Un jeu de karting GenericName[gl]=Xogo de carreiras con karts GenericName[ro_RO]=Un joc de curse cu carturi -Exec=@PREFIX@/games/supertuxkart --log=file +Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --log=file Terminal=false StartupNotify=false Type=Application -TryExec=@PREFIX@/games/supertuxkart +TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart Categories=Game;ArcadeGame; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit polkit-default-privs for openSUSE:12.3
by root＠hilbert.suse.de 21 Feb '13

21 Feb '13

Hello community, here is the log from the commit of package polkit-default-privs for openSUSE:12.3 checked in at 2013-02-21 10:44:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/polkit-default-privs (Old) and /work/SRC/openSUSE:12.3/.polkit-default-privs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "polkit-default-privs", Maintainer is "meissner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/polkit-default-privs/polkit-default-privs.changes 2013-01-31 01:33:46.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.polkit-default-privs.new/polkit-default-privs.changes 2013-02-21 10:44:12.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 19 16:14:48 UTC 2013 - meissner(a)suse.com + +- whitelist PackageKit / systemd offline update permissions, currently admin only +- more systemd allows to make rpmlint happier bnc#783897 + +------------------------------------------------------------------- Old: ---- more-systemd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit-default-privs.spec ++++++ --- /var/tmp/diff_new_pack.HKu0Wt/_old 2013-02-21 10:44:12.000000000 +0100 +++ /var/tmp/diff_new_pack.HKu0Wt/_new 2013-02-21 10:44:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package polkit-default-privs # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,6 @@ License: GPL-2.0+ Group: Productivity/Security Source: polkit-default-privs-%version.tar.bz2 -Patch0: more-systemd.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Supplements: PolicyKit Supplements: libpolkit0, polkit @@ -43,7 +42,6 @@ %prep %setup -q -%patch0 -p1 %build ++++++ polkit-default-privs-12.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-12.3/polkit-default-privs.restrictive new/polkit-default-privs-12.3/polkit-default-privs.restrictive --- old/polkit-default-privs-12.3/polkit-default-privs.restrictive 2012-11-02 11:08:00.000000000 +0100 +++ new/polkit-default-privs-12.3/polkit-default-privs.restrictive 2013-02-19 17:13:52.000000000 +0100 @@ -361,4 +361,17 @@ # org.kde.recorditnow.helper.watch auth_admin +# +# GNOME control-center (bnc#779938) +# +org.gnome.controlcenter.user-accounts.administration no:no:auth_admin_keep +org.gnome.controlcenter.datetime.configure no:no:auth_admin_keep + +# +# PackageKit / systemd offline updates (bnc#798885) +# +org.freedesktop.packagekit.trigger-offline-update no:no:auth_admin_keep +org.freedesktop.packagekit.clear-offline-update no:no:auth_admin_keep + + ### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-12.3/polkit-default-privs.standard new/polkit-default-privs-12.3/polkit-default-privs.standard --- old/polkit-default-privs-12.3/polkit-default-privs.standard 2012-11-02 11:08:00.000000000 +0100 +++ new/polkit-default-privs-12.3/polkit-default-privs.standard 2013-02-19 17:13:52.000000000 +0100 @@ -347,6 +347,13 @@ org.freedesktop.login1.inhibit-handle-suspend-key auth_admin_keep org.freedesktop.login1.inhibit-handle-hibernate-key auth_admin_keep org.freedesktop.login1.inhibit-handle-lid-switch auth_admin_keep +# even more +org.freedesktop.login1.inhibit-delay-shutdown auth_admin_keep +org.freedesktop.login1.inhibit-delay-sleep auth_admin_keep +org.freedesktop.login1.inhibit-block-idle auth_admin_keep +org.freedesktop.login1.suspend auth_admin_keep:auth_admin_keep:yes +org.freedesktop.login1.suspend-multiple-sessions auth_admin_keep:auth_admin_keep:yes +org.freedesktop.login1.hibernate auth_admin_keep:auth_admin_keep:yes # gnome-control-center @@ -400,5 +407,10 @@ org.gnome.controlcenter.user-accounts.administration no:no:auth_admin_keep org.gnome.controlcenter.datetime.configure no:no:auth_admin_keep +# +# PackageKit / systemd offline updates (bnc#798885) +# +org.freedesktop.packagekit.trigger-offline-update no:no:auth_admin_keep +org.freedesktop.packagekit.clear-offline-update no:no:auth_admin_keep ### -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0