openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2013
- 1 participants
- 1989 discussions
Hello community,
here is the log from the commit of package patchinfo.1340 for openSUSE:12.1:Update checked in at 2013-02-27 17:05:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update/patchinfo.1340 (Old)
and /work/SRC/openSUSE:12.1:Update/.patchinfo.1340.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patchinfo.1340", Maintainer is ""
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_patchinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _patchinfo ++++++
<patchinfo>
<issue id="803332" tracker="bnc" />
<issue id="CVE-2012-5783" tracker="cve" />
<category>security</category>
<rating>moderate</rating>
<packager>mvyskocil</packager>
<description>jakarta-commons-httpclient3 was updated to add SSL certificate hostname checking. (CVE-2012-5783)
</description>
<summary>jakarta-commons-httpclient3: Add SSL certificate hostname checking.</summary>
</patchinfo>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
27 Feb '13
Hello community,
here is the log from the commit of package jakarta-commons-httpclient3.1340 for openSUSE:12.1:Update checked in at 2013-02-27 17:05:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update/jakarta-commons-httpclient3.1340 (Old)
and /work/SRC/openSUSE:12.1:Update/.jakarta-commons-httpclient3.1340.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-httpclient3.1340", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2013-02-26 18:15:11.936010755 +0100
+++ /work/SRC/openSUSE:12.1:Update/.jakarta-commons-httpclient3.1340.new/jakarta-commons-httpclient3.changes 2013-02-27 17:05:06.000000000 +0100
@@ -0,0 +1,41 @@
+-------------------------------------------------------------------
+Thu Feb 14 08:47:07 UTC 2013 - mvyskocil(a)suse.com
+
+- fix bnc#803332: no ssl certificate hostname checking (CVE-2012-5783)
+ * commons-httpclient-CVE-2012-5783.patch
+- use versioned provides/obsoletes
+
+-------------------------------------------------------------------
+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.0.1-src.tar.bz2
commons-httpclient-CVE-2012-5783.patch
jakarta-commons-httpclient3.changes
jakarta-commons-httpclient3.spec
java150_build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-httpclient3.spec ++++++
#
# spec file for package jakarta-commons-httpclient3
#
# 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
Name: jakarta-commons-httpclient3
BuildRequires: ant-junit
BuildRequires: jaf
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-discovery
BuildRequires: java2-devel-packages
BuildRequires: javamail
BuildRequires: log4j-mini
BuildRequires: servletapi5
BuildRequires: wsdl4j
%define short_name httpclient3
%define name jakarta-commons-%{short_name}
%define version 3.0.1
%define release 0.rc4.1jpp
%define section free
Version: 3.0.1
Release: 0
Summary: Feature rich package for accessing resources via HTTP
License: Apache-2.0
Group: Development/Libraries/Java
#Source0: http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-ht…
Source0: commons-httpclient-%{version}-src.tar.bz2
#PATCH-FIX-UPSTREAM: bnc#803332
#http://svn.apache.org/viewvc?view=revision&revision=483925
Patch0: commons-httpclient-CVE-2012-5783.patch
Patch150: java150_build.patch
Url: http://jakarta.apache.org/commons/httpclient/
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: jakarta-commons-logging >= 1.0.3
Provides: commons-%{short_name} = %{version}-%{release}
Obsoletes: commons-%{short_name} < %{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.
Authors:
--------
Adrian Sutton
Alex Chaffee
Arun Mammen Thomas
Juozas Baliuka
Henri Yandell
Jeff Brekke
Bruno D'Avanzo
Costin Manolache
Craig R. McClanahan
Daniel F. Savarese
David Graham
Davanum Srinivas
Dion Gillard
Dirk Verbeeck
Daniel Rall
Dmitri Plotnikov
Eric Pugh
Fredrik Westermarck
Geir Magnusson Jr.
Gary Gregory
Glenn Nielsen
Henning P. Schmiedehausen
Ted Husted
Mario Ivankovits
James Carman
Sung-Gu Park
Jean-Frederic Clere
John Keyes
John McNally
Jon Stevens
Jeff Dever
James Strachan
Jason van Zyl
Jan Luehe
Martin Cooper
Matthew Hawthorne
Michael Becke
Mark R. Diggory
Morgan Delagrange
Martin Poeschl
Mladen Turk
Martin van den Bemt
Noel J. Bergman
Ortwin Gluck
Oleg Kalnichevski
Patrick Luby
Peter Royal
Phil Steitz
Robert Burrell Donkin
Remy Maucherat
Robert Leland
Richard Sitze
Rodney Waldhoff
Scott Sanders
Serge Knystautas
Steve Cohen
Stephen Colebourne
Shawn Bayern
Simon Kitching
Steven Caswell
Sean Sullivan
Tim O'Brien
James Turner
Bob McWhirter
Yoav Shapira
%package javadoc
PreReq: coreutils
Summary: Developer documentation for jakarta-commons-httpclient3
Group: Development/Libraries/Java
%description javadoc
Developer documentation for jakarta-commons-httpclient3 in JavaDoc
format.
Authors:
--------
Adrian Sutton
Alex Chaffee
Arun Mammen Thomas
Juozas Baliuka
Henri Yandell
Jeff Brekke
Bruno D'Avanzo
Costin Manolache
Craig R. McClanahan
Daniel F. Savarese
David Graham
Davanum Srinivas
Dion Gillard
Dirk Verbeeck
Daniel Rall
Dmitri Plotnikov
Eric Pugh
Fredrik Westermarck
Geir Magnusson Jr.
Gary Gregory
Glenn Nielsen
Henning P. Schmiedehausen
Ted Husted
Mario Ivankovits
James Carman
Sung-Gu Park
Jean-Frederic Clere
John Keyes
John McNally
Jon Stevens
Jeff Dever
James Strachan
Jason van Zyl
Jan Luehe
Martin Cooper
Matthew Hawthorne
Michael Becke
Mark R. Diggory
Morgan Delagrange
Martin Poeschl
Mladen Turk
Martin van den Bemt
Noel J. Bergman
Ortwin Gluck
Oleg Kalnichevski
Patrick Luby
Peter Royal
Phil Steitz
Robert Burrell Donkin
Remy Maucherat
Robert Leland
Richard Sitze
Rodney Waldhoff
Scott Sanders
Serge Knystautas
Steve Cohen
Stephen Colebourne
Shawn Bayern
Simon Kitching
Steven Caswell
Sean Sullivan
Tim O'Brien
James Turner
Bob McWhirter
Yoav Shapira
%{summary}.
%package demo
Summary: Demonstration files for jakarta-commons-httpclient3
Group: Development/Libraries/Java
Requires: %{name} = %{version}-%{release}
%description demo
Demonstration files for jakarta-commons-httpclient3. 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.
Authors:
--------
Adrian Sutton
Alex Chaffee
Arun Mammen Thomas
Juozas Baliuka
Henri Yandell
Jeff Brekke
Bruno D'Avanzo
Costin Manolache
Craig R. McClanahan
Daniel F. Savarese
David Graham
Davanum Srinivas
Dion Gillard
Dirk Verbeeck
Daniel Rall
Dmitri Plotnikov
Eric Pugh
Fredrik Westermarck
Geir Magnusson Jr.
Gary Gregory
Glenn Nielsen
Henning P. Schmiedehausen
Ted Husted
Mario Ivankovits
James Carman
Sung-Gu Park
Jean-Frederic Clere
John Keyes
John McNally
Jon Stevens
Jeff Dever
James Strachan
Jason van Zyl
Jan Luehe
Martin Cooper
Matthew Hawthorne
Michael Becke
Mark R. Diggory
Morgan Delagrange
Martin Poeschl
Mladen Turk
Martin van den Bemt
Noel J. Bergman
Ortwin Gluck
Oleg Kalnichevski
Patrick Luby
Peter Royal
Phil Steitz
Robert Burrell Donkin
Remy Maucherat
Robert Leland
Richard Sitze
Rodney Waldhoff
Scott Sanders
Serge Knystautas
Steve Cohen
Stephen Colebourne
Shawn Bayern
Simon Kitching
Steven Caswell
Sean Sullivan
Tim O'Brien
James Turner
Bob McWhirter
Yoav Shapira
%{summary}.
%package manual
Summary: Manual for jakarta-commons-httpclient3
Group: Development/Libraries/Java
%description manual
Manual for jakarta-commons-httpclient3
Authors:
--------
Adrian Sutton
Alex Chaffee
Arun Mammen Thomas
Juozas Baliuka
Henri Yandell
Jeff Brekke
Bruno D'Avanzo
Costin Manolache
Craig R. McClanahan
Daniel F. Savarese
David Graham
Davanum Srinivas
Dion Gillard
Dirk Verbeeck
Daniel Rall
Dmitri Plotnikov
Eric Pugh
Fredrik Westermarck
Geir Magnusson Jr.
Gary Gregory
Glenn Nielsen
Henning P. Schmiedehausen
Ted Husted
Mario Ivankovits
James Carman
Sung-Gu Park
Jean-Frederic Clere
John Keyes
John McNally
Jon Stevens
Jeff Dever
James Strachan
Jason van Zyl
Jan Luehe
Martin Cooper
Matthew Hawthorne
Michael Becke
Mark R. Diggory
Morgan Delagrange
Martin Poeschl
Mladen Turk
Martin van den Bemt
Noel J. Bergman
Ortwin Gluck
Oleg Kalnichevski
Patrick Luby
Peter Royal
Phil Steitz
Robert Burrell Donkin
Remy Maucherat
Robert Leland
Richard Sitze
Rodney Waldhoff
Scott Sanders
Serge Knystautas
Steve Cohen
Stephen Colebourne
Shawn Bayern
Simon Kitching
Steven Caswell
Sean Sullivan
Tim O'Brien
James Turner
Bob McWhirter
Yoav Shapira
%{summary}.
%prep
%setup -q -n commons-httpclient-%{version}
%patch150 -p1
mkdir lib # duh
rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej
%build
export CLASSPATH=%(build-classpath jsse jce junit jakarta-commons-codec jakarta-commons-logging)
ant \
-Dbuild.sysclasspath=first \
-Djavadoc.j2sdk.link=%{_javadocdir}/java \
-Djavadoc.logging.link=%{_javadocdir}/jakarta-commons-logging \
dist
%install
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p dist/commons-httpclient.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
mv dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
# 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
%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt RELEASE_NOTES.txt
%{_javadir}/*
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %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.0.1/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
===================================================================
--- commons-httpclient-3.0.1.orig/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
+++ commons-httpclient-3.0.1/src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
@@ -30,10 +30,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;
@@ -78,12 +85,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;
}
/**
@@ -123,15 +135,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;
}
}
@@ -141,10 +156,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;
}
/**
@@ -156,14 +173,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.
*/
++++++ java150_build.patch ++++++
Index: commons-httpclient-3.0.1/build.xml
===================================================================
--- commons-httpclient-3.0.1.orig/build.xml
+++ commons-httpclient-3.0.1/build.xml
@@ -180,6 +180,7 @@
<target name="compile" depends="static"
description="Compile shareable components">
<javac srcdir ="${source.home}/java"
+ source="1.4" target="1.4"
destdir ="${build.home}/classes"
debug ="${compile.debug}"
deprecation ="${compile.deprecation}"
@@ -187,6 +188,7 @@
<classpath refid="compile.classpath"/>
</javac>
<javac srcdir ="${source.home}/examples"
+ source="1.4" target="1.4"
destdir ="${build.home}/examples"
debug ="${compile.debug}"
deprecation ="${compile.deprecation}"
@@ -198,6 +200,7 @@
<target name="compile.tests" depends="compile"
description="Compile unit test cases">
<javac srcdir ="${test.home}"
+ source="1.4" target="1.4"
destdir ="${build.home}/tests"
debug ="${compile.debug}"
deprecation ="${compile.deprecation}"
@@ -240,6 +243,7 @@
<mkdir dir="${dist.home}/docs"/>
<mkdir dir="${dist.home}/docs/api"/>
<javadoc sourcepath ="${source.home}/java"
+ source="1.4"
destdir ="${dist.home}/docs/api"
packagenames ="org.apache.commons.*"
author ="true"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
27 Feb '13
Hello community,
here is the log from the commit of package jakarta-commons-httpclient.1340 for openSUSE:12.2:Update checked in at 2013-02-27 17:05:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/jakarta-commons-httpclient.1340 (Old)
and /work/SRC/openSUSE:12.2:Update/.jakarta-commons-httpclient.1340.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-httpclient.1340", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2013-02-26 18:15:11.936010755 +0100
+++ /work/SRC/openSUSE:12.2:Update/.jakarta-commons-httpclient.1340.new/jakarta-commons-httpclient.changes 2013-02-27 17:05:03.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
%patch02
%patch03 -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
Hello community,
here is the log from the commit of package patterns-openSUSE for openSUSE:12.3 checked in at 2013-02-27 10:31:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/patterns-openSUSE (Old)
and /work/SRC/openSUSE:12.3/.patterns-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patterns-openSUSE", Maintainer is "coolo(a)suse.com"
Changes:
--------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ patterns-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.yWpGda/_old 2013-02-27 10:31:54.000000000 +0100
+++ /var/tmp/diff_new_pack.yWpGda/_new 2013-02-27 10:31:54.000000000 +0100
@@ -2373,11 +2373,17 @@
%setup -q -n patterns-openSUSE-data
%build
+%ifarch %ix86
+export EXPLICIT_UNAME=i386
+%endif
+%ifarch x86_64
+export EXPLICIT_UNAME=x86_64
+%endif
for i in data/*; do sh %{SOURCE1} $i; done | perl %{SOURCE4} | \
uniq > data/REST-DVD-SUGGESTS
for i in gnome kde4; do
- sh %{SOURCE1} toinstall/rest_cd_$i/requires > t && \
- mv t toinstall/rest_cd_$i/requires
+ sh %{SOURCE1} toinstall/rest_cd_$i/requires > n.$i && \
+ mv n.$i toinstall/rest_cd_$i/requires
done
/usr/sbin/patterns_utf8
@@ -2389,6 +2395,12 @@
# For generation of -32bit/-x86/-64bit patterns
export RPM_BUILD_ROOT
export RPM_SOURCE_DIR
+%ifarch %ix86
+export EXPLICIT_UNAME=i386
+%endif
+%ifarch x86_64
+export EXPLICIT_UNAME=x86_64
+%endif
sh -e %{SOURCE5} %{version} %{release} %{_target_cpu} openSUSE
/usr/sbin/patterns_lint %{buildroot}/CD1/suse/setup/descr/*.pat
rm %{buildroot}/CD1/suse/setup/descr/kde4_cd-*.pat
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package patchinfo.1364 for openSUSE:12.2:Update checked in at 2013-02-27 10:30:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/patchinfo.1364 (Old)
and /work/SRC/openSUSE:12.2:Update/.patchinfo.1364.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patchinfo.1364", Maintainer is ""
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_patchinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _patchinfo ++++++
<patchinfo>
<packager>vdziewiecki</packager>
<category>recommended</category>
<rating>low</rating>
<summary>lightdm: Fixing language-settings</summary>
<description>This update fixes the following issue for lightdm:
- bnc#805000: Fixed language-settings in lightdm-gtk-greeter</description>
<issue tracker="bnc" id="805000">Selecting locale in lightdm-gtk-greeter has no effect</issue>
</patchinfo>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lightdm for openSUSE:12.2:Update checked in at 2013-02-27 10:30:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/lightdm (Old)
and /work/SRC/openSUSE:12.2:Update/.lightdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm", Maintainer is ""
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_link
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
<link package='lightdm.1364' 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
Hello community,
here is the log from the commit of package lightdm.1364 for openSUSE:12.2:Update checked in at 2013-02-27 10:30:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/lightdm.1364 (Old)
and /work/SRC/openSUSE:12.2:Update/.lightdm.1364.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm.1364", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2013-02-26 18:15:11.936010755 +0100
+++ /work/SRC/openSUSE:12.2:Update/.lightdm.1364.new/lightdm.changes 2013-02-27 10:30:10.000000000 +0100
@@ -0,0 +1,390 @@
+-------------------------------------------------------------------
+Thu Feb 21 15:34:32 UTC 2013 - vdziewiecki(a)suse.com
+
+-Backport lightdm-fix-language-setting.patch from factory
+(bnc#805000 - Selecting locale in lightdm-gtk-greeter has no
+effect)
+
+-------------------------------------------------------------------
+Thu Apr 19 09:14:12 UTC 2012 - gber(a)opensuse.org
+
+- update to version 1.2.2
+ - fix wrapper path in AppArmor profile (broken since 1.1.1)
+ - add show-manual-login and allow-guest options to
+ lightdm-set-defaults
+ - add missing regression test script
+- dropped lightdm-use-pkglibexecdir.patch which has been
+ incorporated upstream
+
+-------------------------------------------------------------------
+Fri Apr 6 22:42:43 UTC 2012 - gber(a)opensuse.org
+
+- update to version 1.2.0
+ - new major release, please see the included NEWS for a detailed
+ list of changes
+- dropped lightdm-desktop-session-env-pam.patch since
+ DESKTOP_SESSION is now in the PAM environment before
+ pam_open_session() is called
+- dropped lightdm-remove-xauthority-ownership-fix.patch since the
+ code has been removed by upstream
+- dropped lightdm-call-g_thread_init-conditionally.patch since the
+ problem has been fixed by upstream
+- removed lightdm-gtk-greeter and lightdm-qt-greeter which are now
+ separate projects
+
+-------------------------------------------------------------------
+Wed Mar 21 08:24:34 UTC 2012 - gber(a)opensuse.org
+
+- update to version 1.0.10
+ - fix compilation failure in liblightdm-qt with GCC 4.7
+- dropped obsolete lightdm-fix-missing-includes.patch
+
+-------------------------------------------------------------------
+Sat Mar 17 18:50:38 UTC 2012 - boris(a)steki.net
+
+- add lightdm-fix-missing-includes.patch which adds missing
+ includes (lp#958097)
+
+-------------------------------------------------------------------
+Fri Mar 2 11:10:07 UTC 2012 - gber(a)opensuse.org
+
+- update to version 1.0.9
+ - stop file descriptors leaking into the session processes
+ (bnc#745339, lp#927060, CVE-2012-1111)
+ - fix compilation against gthread
+ - change session directory once user permissions are set so it
+ works on NFS filesystems that don't allow root to access files
+ - fix object cleanup on exit
+ - fix lightdm --debug not working on newer GLib
+ - drop privileges when reading ~/.dmrc (CVE-2011-3153)
+ - fix crash calling lightdm_get_layout
+- drop lightdm-CVE-2011-3153.patch which has been included upstream
+
+-------------------------------------------------------------------
+Sun Jan 8 10:11:16 UTC 2012 - gber(a)opensuse.org
+
+- added lightdm-call-g_thread_init-conditionally.patch in order to
+ call g_thread_init() only on glib < 2.31.0
+- no need to own %{_libexecdir}/X11/
+
+-------------------------------------------------------------------
+Sat Dec 3 11:43:28 UTC 2011 - gber(a)opensuse.org
+
+- regenerate moc files
+
+-------------------------------------------------------------------
+Tue Nov 15 16:29:15 UTC 2011 - prusnak(a)opensuse.org
+
+- fix .dmrc handling (CVE-2011-3153) [bnc#728627]
+
+-------------------------------------------------------------------
+Thu Nov 10 08:53:40 UTC 2011 - gber(a)opensuse.org
+
+- added lightdm-remove-xauthority-ownership-fix.patch which removes
+ the code correcting the ownership of .Xauthority files, it is
+ still not secure and the buggy LightDM version writing
+ .Xauthority as root never was in a released openSUSE version
+ anyway (bnc#730062)
+
+-------------------------------------------------------------------
+Wed Nov 2 16:38:24 UTC 2011 - gber(a)opensuse.org
+
+- Update to version 1.0.6
+ - use lchown for correcting ownership of ~/.Xauthority instead of
+ chown, this fixes a security issue where using ~/.Xauthority as
+ a symlink would cause LightDM to set the destination of the
+ link to user ownership (CVE-2011-4105)
+
+-------------------------------------------------------------------
+Sun Oct 30 19:05:10 UTC 2011 - gber(a)opensuse.org
+
+- added dependency on gnome-themes-accessibility to
+ lightdm-gtk-greeter in order to make it high contrast
+ accessibility option work
+
+-------------------------------------------------------------------
+Thu Oct 27 16:28:08 UTC 2011 - gber(a)opensuse.org
+
+- update to version 1.0.5
+ - relax AppArmor guest profile to allow compiz to start
+ - connect up VNC settings for width, height, depth
+- dropped lightdm-vnc-configuration.patch which has been integrated
+
+-------------------------------------------------------------------
+Wed Oct 26 09:47:23 UTC 2011 - gber(a)opensuse.org
+
+- update to version 1.0.4
+ - fix --enable-gtk-greeter=yes not working
+ - fix X sessions with arguments in Exec not working
+ - use previous session for automatic login or if greeter does not
+ request one
+ - correct ownership of ~/.Xauthority if upgrading from buggy
+ version of LightDM that had it root owned
+ - set default resolution of VNC to 1024x768, add settings for
+ width, height, depth into lightdm.conf
+ - AppArmor profile: Fix broken gnome-keyring and dbus/gwibber,
+ and quiesce annoying kernel audit messages for privileges that
+ we definitively do not want to grant
+ - set LOGNAME environment variable
+
+-------------------------------------------------------------------
+Tue Oct 18 17:09:01 UTC 2011 - gber(a)opensuse.org
+
+- added lighdm-vnc-configuration.patch in order to set the default
+ resolution of VNC to 1024x768, add settings for width, height,
+ depth into lightdm.conf
+
+-------------------------------------------------------------------
+Sat Oct 8 11:24:00 UTC 2011 - gber(a)opensuse.org
+
+- update to version 1.0.3
+ - fix reference counting issue in ConsoleKit code
+ - really add the lightdm-guest-session-wrapper
+- added lightdm-use-pkglibexecdir.patch in order to use
+ pkglibexecdir instead of libexecdir for helper binaries/scripts
+
+-------------------------------------------------------------------
+Thu Oct 6 09:04:51 UTC 2011 - gber(a)opensuse.org
+
+- update to version 1.0.2
+ - fix daemon from blocking if Accounts Service does not exist
+ - fix greeter log file not being written
+ - don't set LANG environment variable if using Accounts Service
+ - fix gdmflexiserver not working due to it not being in PATH
+ - don't authenticate the greeter user
+ - allow greeters to be disabled in configure flags
+ - fix over allocation of read buffer in greeter protocol
+ - make sure objects are cleaned up on exit
+ - fix minor memory leaks
+ - fix hugely oversized allocation in greeter buffer, can trigger
+ crashes when entering very long passwords
+
+-------------------------------------------------------------------
+Wed Oct 5 23:07:19 UTC 2011 - gber(a)opensuse.org
+
+- update to version 1.0.1
+ - GTK greeter now remembers last user
+ - GTK greeter now initializes i18n
+ - start authentication for automatically selected user in GTK
+ greeter
+ - link liblightdm-qt against QtGui
+ - fix liblightdm-qt crashing when face images are installed
+ - set correct permissions on session log files
+ - prefer a locale with a codeset over one without for setting
+ LANG
+ - introduce a lightdm-guest-session-wrapper session command
+ which MAC systems like AppArmor and SELinux can use for
+ attaching a restrictive policy to guest sessions
+ - provide an AppArmor profile for guest session lockdown
+
+-------------------------------------------------------------------
+Mon Oct 3 17:14:41 UTC 2011 - gber(a)opensuse.org
+
+- add dependency on ConsoleKit-x11
+- add optional dependency on accountsservice to
+ liblightdm-gobject-1-0
+
+-------------------------------------------------------------------
+Wed Sep 28 09:22:46 UTC 2011 - gber(a)opensuse.org
+
+- update to version 1.0.0
+ - explicitly grab keyboard focus in GTK greeter
+ - fix removed power and a11y menu items in GTK greeter
+ - put system binary directory into path when running in test mode
+ - call pam_getenvlist after pam_setcred
+
+-------------------------------------------------------------------
+Mon Sep 26 14:07:55 UTC 2011 - gber(a)opensuse.org
++++ 193 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.2:Update/.lightdm.1364.new/lightdm.changes
New:
----
X11-displaymanagers-lightdm
lightdm-1.2.2.tar.gz
lightdm-autologin.pamd
lightdm-default-configuration.patch
lightdm-fix-language-setting.patch
lightdm-lock-screen-before-switch.patch
lightdm-rpmlintrc
lightdm-set-gdmflexiserver-envvar.patch
lightdm-sysconfig-support.patch
lightdm-xauthlocalhostname-support.patch
lightdm.changes
lightdm.pamd
lightdm.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
#
# spec file for package lightdm
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Guido Berhoerster.
#
# 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/
#
%define gobject_libname lightdm-gobject-1
%define gobject_lib lib%{gobject_libname}-0
%define qt_libname lightdm-qt-2
%define qt_lib lib%{qt_libname}-0
Name: lightdm
Version: 1.2.2
Release: 0
Summary: Lightweight, Cross-desktop Display Manager
License: GPL-3.0+
Group: System/X11/Displaymanagers
Url: http://www.freedesktop.org/wiki/Software/LightDM
Source0: %{name}-%{version}.tar.gz
Source1: %{name}.pamd
Source2: %{name}-autologin.pamd
Source3: X11-displaymanagers-%{name}
Source100: %{name}-rpmlintrc
# PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch gber(a)opensuse.org -- Adds support for reading configuration options from /etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager
Patch1: lightdm-sysconfig-support.patch
# PATCH-FEATURE-OPENSUSE lightdm-xauthlocalhostname-support.patch gber(a)opensuse.org -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes
Patch2: lightdm-xauthlocalhostname-support.patch
# PATCH-FEATURE-OPENSUSE lightdm-set-gdmflexiserver-envvar.patch gber(a)opensuse.org -- Sets the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper
Patch4: lightdm-set-gdmflexiserver-envvar.patch
# PATCH-FEATURE-OPENSUSE lightdm-default-configuration.patch gber(a)opensuse.org -- Modifies configuration with suitable defaults for openSUSE
Patch5: lightdm-default-configuration.patch
# PATCH-FIX-UPSTREAM lightdm-lock-screen-before-switch.patch gber(a)opensuse.org -- Try to lock the screen before switching users
Patch7: lightdm-lock-screen-before-switch.patch
# PATCH-FIX-UPSTREAM vdziewiecki(a)suse.cz fix selecting locale in lightdm-gtk-greeter
Patch8: lightdm-fix-language-setting.patch
BuildRequires: gcc-c++
BuildRequires: gnome-common
BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: pam-devel
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(QtDBus)
BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xdmcp)
Requires(pre): pwdutils
# 3rd party greeters don't have to follow
# the same versioning of lightdm
Requires: ConsoleKit-x11
Requires: gdmflexiserver
Requires: lightdm-greeter
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
LightDM is a lightweight, cross-desktop display manager. Its main features are
a well-defined greeter API allowing multiple GUIs, support for all display
manager use cases, with plugins where appropriate, low code complexity, and
fast performance. Due to its cross-platform nature greeters can be written in
several toolkits such as Qt and GTK.
%lang_package
%package -n %{gobject_lib}
Summary: LightDM GObject-based Client Library
Group: System/Libraries
Recommends: accountsservice
%description -n %{gobject_lib}
A GObject-based library for LightDM clients to use to interface with LightDM.
%package gobject-devel
Summary: Development Files for %{gobject_lib}
Group: Development/Libraries/C and C++
Requires: %{gobject_lib} = %{version}
%description gobject-devel
This package contains development files needed for developing GObject-based
LightDM clients.
%package -n %{qt_lib}
Summary: LightDM Qt-based Client Library
Group: System/Libraries
%description -n %{qt_lib}
A Qt-based library for LightDM clients to use to interface with LightDM.
%package qt-devel
Summary: Development Files for %{qt_lib}
Group: Development/Libraries/C and C++
Requires: %{qt_lib} = %{version}
%description qt-devel
This package contains development files needed for developing Qt-based
LightDM clients.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
%build
./autogen.sh
%configure \
--libexecdir=%{_libexecdir} \
--disable-static \
--enable-gtk-doc \
--with-user-session=twm \
--with-greeter-session=lightdm-default-greeter \
--with-greeter-user=lightdm
make %{?_smp_mflags} V=1
%install
%make_install
rm -f %{buildroot}%{_libdir}/*.la
rm -rf %{buildroot}%{_sysconfdir}/init/
install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
install -D -m 644 %{SOURCE3} %{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm
install -d %{buildroot}%{_localstatedir}/log/lightdm
install -d %{buildroot}%{_localstatedir}/run/lightdm
install -d %{buildroot}%{_localstatedir}/lib/lightdm
install -d %{buildroot}%{_datadir}/xgreeters
%find_lang %{name} %{?no_lang_C}
%clean
rm -rf %{buildroot}
%pre
/usr/sbin/groupadd -r lightdm 2> /dev/null || :
/usr/sbin/useradd -r -o -g lightdm -s /bin/false -c "LightDM daemon" \
-d /var/lib/lightdm lightdm 2> /dev/null || :
/usr/sbin/usermod -g lightdm -G lightdm -s /bin/false lightdm 2> /dev/null
%post -n %{gobject_lib} -p /sbin/ldconfig
%postun -n %{gobject_lib} -p /sbin/ldconfig
%post -n %{qt_lib} -p /sbin/ldconfig
%postun -n %{qt_lib} -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog NEWS README
%{_bindir}/dm-tool
%{_sbindir}/lightdm
%dir %{_libexecdir}/lightdm/
%{_libexecdir}/%{name}/lightdm-set-defaults
%{_libexecdir}/%{name}/gdmflexiserver
%{_libexecdir}/%{name}/lightdm-guest-session-wrapper
%dir %{_sysconfdir}/lightdm/
%config %{_sysconfdir}/lightdm/lightdm.conf
%config %{_sysconfdir}/lightdm/users.conf
%config %{_sysconfdir}/lightdm/keys.conf
%config %{_sysconfdir}/pam.d/lightdm*
%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
%dir %{_sysconfdir}/apparmor.d/
%{_sysconfdir}/apparmor.d/lightdm-guest-session
%dir %{_libexecdir}/X11/displaymanagers/
%{_libexecdir}/X11/displaymanagers/lightdm
%dir %{_datadir}/xgreeters/
%ghost %attr(751,lightdm,lightdm) %dir %{_localstatedir}/run/lightdm
%attr(750,lightdm,lightdm) %dir %{_localstatedir}/log/lightdm
%attr(750,lightdm,lightdm) %dir %{_localstatedir}/lib/lightdm
%doc %{_mandir}/man1/lightdm.1*
%files lang -f %{name}.lang
%files -n %{gobject_lib}
%defattr(-,root,root,-)
%{_libdir}/lib%{gobject_libname}.so.*
%files gobject-devel
%defattr(-,root,root,-)
%{_libdir}/lib%{gobject_libname}.so
%{_libdir}/pkgconfig/lib%{gobject_libname}.pc
%{_includedir}/%{gobject_libname}/
%{_libdir}/girepository-1.0/LightDM-1.typelib
%{_datadir}/gir-1.0/LightDM-1.gir
%dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/liblightdm-gobject-1.vapi
%doc %{_datadir}/gtk-doc/html/%{gobject_libname}/
%files -n %{qt_lib}
%defattr(-,root,root,-)
%{_libdir}/lib%{qt_libname}.so.*
%files qt-devel
%defattr(-,root,root,-)
%{_libdir}/lib%{qt_libname}.so
%{_libdir}/pkgconfig/lib%{qt_libname}.pc
%{_includedir}/%{qt_libname}/
%changelog
++++++ X11-displaymanagers-lightdm ++++++
lightdm_reload_proc() {
/etc/init.d/xdm restart
exit $?
}
lightdm_vars() {
case $1 in
lightdm)
DISPLAYMANAGER=/usr/sbin/lightdm
RELOADPROC=lightdm_reload_proc
;;
*)
return 1
;;
esac
return 0
}
++++++ lightdm-autologin.pamd ++++++
#%PAM-1.0
auth required pam_permit.so
account include common-account
password include common-password
session required pam_loginuid.so
session include common-session
++++++ lightdm-default-configuration.patch ++++++
openSUSE-specific default configuration
diff --git a/data/lightdm.conf b/data/lightdm.conf
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -47,7 +47,7 @@
#greeter-user=lightdm
#minimum-display-number=0
#minimum-vt=7
-#user-authority-in-system-dir=false
+user-authority-in-system-dir=true
#guest-account-script=guest-account
#log-directory=/var/log/lightdm
#run-directory=/var/run/lightdm
@@ -84,7 +84,7 @@
# exit-on-failure = True if the daemon should exit if this seat fails
#
[SeatDefaults]
-#xserver-command=X
+xserver-command=/usr/bin/X
#xserver-layout=
#xserver-config=
#xserver-allow-tcp=false
@@ -98,11 +98,11 @@
#user-session=default
#allow-guest=true
#guest-session=UNIMPLEMENTED
-#session-wrapper=lightdm-session
+session-wrapper=/etc/X11/xdm/Xsession
#display-setup-script=
-#greeter-setup-script=
-#session-setup-script=
-#session-cleanup-script=
+greeter-setup-script=/etc/X11/xdm/Xsetup
+session-setup-script=/etc/X11/xdm/Xstartup
+session-cleanup-script=/etc/X11/xdm/Xreset
#autologin-guest=false
#autologin-user=
#autologin-user-timeout=0
diff --git a/data/users.conf b/data/users.conf
--- a/data/users.conf
+++ b/data/users.conf
@@ -9,6 +9,6 @@
# hidden-shells = Shells that indicate a user cannot login
#
[UserAccounts]
-minimum-uid=500
-hidden-users=nobody nobody4 noaccess
-hidden-shells=/bin/false /usr/sbin/nologin
+minimum-uid=1000
+hidden-users=nobody
+hidden-shells=/bin/false /sbin/nologin
++++++ lightdm-fix-language-setting.patch ++++++
# HG changeset patch
# Parent 914564e535f0a132b097bc5a066908c04892180d
Fix saving/retrieving of the language setting
Add user_get_language() for retrieving the language setting.
Remove unused user_get_locale().
Always save the language to both accountsservice and dmrc.
Actually retrieve the language setting and export the locale via LANG and
GDM_LANG environment variables.
diff --git a/src/accounts.c b/src/accounts.c
--- a/src/accounts.c
+++ b/src/accounts.c
@@ -44,9 +44,6 @@ struct UserPrivate
/* Language */
gchar *language;
- /* Locale */
- gchar *locale;
-
/* X session */
gchar *xsession;
};
@@ -332,36 +329,59 @@ user_get_shell (User *user)
return user->priv->shell;
}
-const gchar *
-user_get_locale (User *user)
-{
- g_return_val_if_fail (user != NULL, NULL);
-
- g_free (user->priv->locale);
- if (user->priv->proxy)
- user->priv->locale = NULL;
- else
- user->priv->locale = get_string_from_dmrc (user->priv->name, "Desktop", "Language");
-
- /* Treat a blank locale as unset */
- if (g_strcmp0 (user->priv->locale, "") == 0)
- {
- g_free (user->priv->locale);
- user->priv->locale = NULL;
- }
-
- return user->priv->locale;
-}
-
void
user_set_language (User *user, const gchar *language)
{
g_return_if_fail (user != NULL);
+ call_method (user->priv->proxy, "SetLanguage", g_variant_new ("(s)", language), "()", NULL);
+ save_string_to_dmrc (user->priv->name, "Desktop", "Language", language);
+}
+
+const gchar *
+user_get_language (User *user)
+{
+ GVariant *variant, *inner;
+ gboolean success;
+
+ g_return_val_if_fail (user != NULL, NULL);
+
+ g_free (user->priv->language);
if (user->priv->proxy)
- call_method (user->priv->proxy, "SetLanguage", g_variant_new ("(s)", language), "()", NULL);
+ {
+ /* get_property () uses g_dbus_proxy_get_cached_property () which would
+ * return the previous (cached) value of the "Language" property */
+#if 0
+ if (get_property (user->priv->proxy, "Language", "s", &variant))
+ {
+ g_variant_get (variant, "s", &user->priv->language);
+ g_variant_unref (variant);
+ }
+ else
+ user->priv->language = NULL;
+#endif
+ success = call_method (user->priv->proxy, "org.freedesktop.DBus.Properties.Get", g_variant_new ("(ss)", g_dbus_proxy_get_interface_name(user->priv->proxy), "Language"), "(v)", &variant);
+ if (success)
+ {
+ g_variant_get (variant, "(v)", &inner);
+ user->priv->language = g_variant_dup_string (inner, NULL);
+ g_variant_unref (inner);
+ g_variant_unref (variant);
+ }
+ else
+ user->priv->language = NULL;
+ }
else
- save_string_to_dmrc (user->priv->name, "Desktop", "Language", language);
+ user->priv->language = get_string_from_dmrc (user->priv->name, "Desktop", "Language");
+
+ /* Treat a blank language as unset */
+ if (g_strcmp0 (user->priv->language, "") == 0)
+ {
+ g_free (user->priv->language);
+ user->priv->language = NULL;
+ }
+
+ return user->priv->language;
}
void
@@ -436,6 +456,7 @@ user_finalize (GObject *object)
g_free (self->priv->gecos);
g_free (self->priv->home_directory);
g_free (self->priv->shell);
+ g_free (self->priv->language);
G_OBJECT_CLASS (user_parent_class)->finalize (object);
}
diff --git a/src/accounts.h b/src/accounts.h
--- a/src/accounts.h
+++ b/src/accounts.h
@@ -58,7 +58,7 @@ const gchar *user_get_xsession (User *us
void user_set_xsession (User *user, const gchar *session);
-const gchar *user_get_locale (User *user);
+const gchar *user_get_language (User *user);
void user_set_language (User *user, const gchar *language);
diff --git a/src/display.c b/src/display.c
--- a/src/display.c
+++ b/src/display.c
@@ -704,6 +704,7 @@ display_start_session (Display *display)
{
User *user;
gchar *filename, *sessions_dir, *path;
+ const gchar *language;
gchar **argv;
user = session_get_user (display->priv->session);
@@ -727,6 +728,14 @@ display_start_session (Display *display)
if (!argv)
return TRUE;
+ /* Retrieve language setting */
+ language = user_get_language (user);
+ if (language != NULL && language != '\0')
+ {
+ session_set_env (display->priv->session, "LANG", language);
+ session_set_env (display->priv->session, "GDM_LANG", language);
+ }
+
session_set_env (display->priv->session, "DESKTOP_SESSION", display->priv->user_session); // FIXME: Apparently deprecated?
session_set_env (display->priv->session, "GDMSESSION", display->priv->user_session); // FIXME: Not cross-desktop
++++++ lightdm-lock-screen-before-switch.patch ++++++
try to lock the screen before switching users
diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver
--- a/utils/gdmflexiserver
+++ b/utils/gdmflexiserver
@@ -9,9 +9,47 @@
#
# See http://www.gnu.org/copyleft/gpl.html for the full text of the license.
+PATH=/usr/local/bin:/bin:/usr/bin
+export PATH
+
if [ -z "$XDG_SEAT_PATH" ]; then
# something went wrong
exit 1
fi
+find_command () {
+ cmd="$1"
+ oIFS="${IFS}"; IFS=:
+ set -- ${PATH}
+ IFS="${oIFS}"
+
+ for part; do
+ [ -x "${part}/${cmd}" ] && return 0
+ done
+ return 1
+}
+
+lock_screen () {
+ for lock_cmd in \
+ "xscreensaver-command -lock" \
+ "gnome-screensaver-command --lock" \
+ "dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call /ScreenSaver org.freedesktop.ScreenSaver.Lock"
+ do
+ ${lock_cmd} >/dev/null 2>&1 && return
+ done
+
+ for lock_cmd in \
+ "slock" \
+ "xlock -mode blank"
+ do
+ set -- ${lock_cmd}
+ if find_command "$1"; then
+ ${lock_cmd} >/dev/null 2>&1 &
+ return
+ fi
+ done
+}
+
+lock_screen
+
dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.DisplayManager $XDG_SEAT_PATH org.freedesktop.DisplayManager.Seat.SwitchToGreeter
++++++ lightdm-rpmlintrc ++++++
addFilter ('untranslated-desktop-file /usr/share/xgreeters/')
++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++
set the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper
diff --git a/src/session-child.c b/src/session-child.c
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -453,10 +453,7 @@ session_child_run (int argc, char **argv
g_free (value);
}
- /* Put our tools directory in the path as a hack so we can use the legacy gdmflexiserver interface */
- path = pam_getenv (pam_handle, "PATH");
- if (path)
- pam_putenv (pam_handle, g_strdup_printf ("PATH=%s:%s", PKGLIBEXEC_DIR, path));
+ pam_putenv (pam_handle, g_strdup_printf ("GDMFLEXISERVER=%s", PKGLIBEXEC_DIR "/gdmflexiserver"));
/* Catch terminate signal and pass it to the child */
signal (SIGTERM, signal_cb);
++++++ lightdm-sysconfig-support.patch ++++++
++++ 644 lines (skipped)
++++++ lightdm-xauthlocalhostname-support.patch ++++++
set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes
diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -141,6 +141,7 @@ seat_xlocal_run_script (Seat *seat, Disp
path = xserver_local_get_authority_file_path (xserver);
process_set_env (script, "DISPLAY", xserver_get_address (XSERVER (xserver)));
process_set_env (script, "XAUTHORITY", path);
+ process_set_env (script, "XAUTHLOCALHOSTNAME", "localhost");
g_free (path);
SEAT_CLASS (seat_xlocal_parent_class)->run_script (seat, display, script);
diff --git a/src/xserver-local.c b/src/xserver-local.c
--- a/src/xserver-local.c
+++ b/src/xserver-local.c
@@ -397,7 +397,8 @@ xserver_local_start (DisplayServer *disp
XServerLocal *server = XSERVER_LOCAL (display_server);
gboolean result;
gchar *filename, *dir, *absolute_command;
- gchar hostname[1024], *number;
+ gchar hostname[] = "localhost";
+ gchar *number;
GString *command;
g_return_val_if_fail (server->priv->xserver_process == NULL, FALSE);
@@ -438,7 +439,6 @@ xserver_local_start (DisplayServer *disp
if (server->priv->layout)
g_string_append_printf (command, " -layout %s", server->priv->layout);
- gethostname (hostname, 1024);
number = g_strdup_printf ("%d", xserver_get_display_number (XSERVER (server)));
if (!server->priv->xdmcp_key)
xserver_set_authority (XSERVER (server), xauth_new_cookie (XAUTH_FAMILY_LOCAL, (guint8*) hostname, strlen (hostname), number));
diff --git a/src/xsession.c b/src/xsession.c
--- a/src/xsession.c
+++ b/src/xsession.c
@@ -15,6 +15,7 @@
#include <sys/stat.h>
#include "xsession.h"
+#include "xserver-local.h"
#include "configuration.h"
#include "privileges.h"
@@ -35,6 +36,8 @@ xsession_new (XServer *xserver)
session = g_object_new (XSESSION_TYPE, NULL);
session->priv->xserver = g_object_ref (xserver);
+ if (IS_XSERVER_LOCAL (XSESSION (session)->priv->xserver))
+ session_set_env (SESSION (session), "XAUTHLOCALHOSTNAME", "localhost");
session_set_env (SESSION (session), "DISPLAY", xserver_get_address (xserver));
session_set_tty (SESSION (session), xserver_get_address (xserver));
session_set_xdisplay (SESSION (session), xserver_get_address (xserver));
++++++ lightdm.pamd ++++++
#%PAM-1.0
auth include common-auth
account include common-account
password include common-password
session required pam_loginuid.so
session include common-session
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package automake for openSUSE:Factory checked in at 2013-02-27 06:42:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/automake (Old)
and /work/SRC/openSUSE:Factory/.automake.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "automake", Maintainer is "pth(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/automake/automake-testsuite.changes 2013-02-26 15:13:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.automake.new/automake-testsuite.changes 2013-02-27 06:42:23.000000000 +0100
@@ -2,40 +1,0 @@
-Tue Feb 19 18:50:46 UTC 2013 - p.drouand(a)gmail.com
-
-- Update to version 1.13.1:
- * Bugs fixed:
- - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now
- causes a clear and helpful error message, instead of obscure ones
- (issue introduced in Automake 1.13).
-- Remove config-guess-sub-update.diff; config.guess and config.sub are
- not included anymore in /lib
-- Clean the specfile; remove useless conditionnal macros
-- Automake now provide manfiles by default and help2man is not required
- anymore
-
--------------------------------------------------------------------
-Thu Sep 13 12:29:33 CEST 2012 - pth(a)suse.de
-
-- Run pre_checkin.sh to sync automake-testsuite pec and .changes.
-
--------------------------------------------------------------------
-Tue Sep 11 17:34:05 UTC 2012 - p.drouand(a)gmail.com
-
-- Update to 1.12.3:
- - reworks and reshuffles the Automake testsuite a bit; fixing some
- weaknesses and spurious failures in the process, but also, likely,
- introducing new ones;
-
- - introduces initial support for automatic dependency tracking with
- the Portland Group C/C++ compilers (thanks to Dave Goodell and
- Jeff A. Daily);
-
- - fixes several long-standing bugs and limitations in the 'ylwrap'
- script (thanks to Akim Demaille); among the other things, the
- long-standing PR/491 and automake bug#7648 are now fixed.
-
--------------------------------------------------------------------
-Wed Jul 4 07:21:17 UTC 2012 - coolo(a)suse.com
-
-- make sure we still define $(mkdir_p) for the time being
-
--------------------------------------------------------------------
automake.changes: same change
Old:
----
automake-1.13.1.tar.xz
New:
----
automake-1.12.1.tar.xz
automake-add-mkdir_p-temporarly.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ automake-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.oF3wmq/_old 2013-02-27 06:42:26.000000000 +0100
+++ /var/tmp/diff_new_pack.oF3wmq/_new 2013-02-27 06:42:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package automake-testsuite
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -16,15 +16,12 @@
#
-# PLEASE run pre_checkin.sh in this directory before submitting
-# this package. Otherwise the .spec and .changes for automake-testsuite
-# aren't updated.
-
Name: automake-testsuite
-BuildRequires: autoconf >= 2.69
+BuildRequires: autoconf
BuildRequires: bison
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
+BuildRequires: help2man
BuildRequires: xz
%if "%{name}" == "automake-testsuite"
BuildRequires: libtool
@@ -32,9 +29,9 @@
BuildRequires: flex
Requires: flex
%endif
-Requires: autoconf >= 2.69
+Requires: autoconf >= 2.62
Requires: info
-Version: 1.13.1
+Version: 1.12.1
Release: 0
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
License: GPL-2.0+
@@ -43,8 +40,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: automake-%{version}.tar.xz
Source1: automake-rpmlintrc
-Patch2: automake-require_file.patch
-Patch100: automake-SuSE.patch
+Patch1: automake-SuSE.patch
+Patch3: automake-require_file.patch
BuildArch: noarch
%description
@@ -55,11 +52,10 @@
%prep
%setup -q -n automake-%{version}
-%patch2
-%patch100
+%patch1
+%patch3
%build
-sh bootstrap.sh
%configure --docdir=%{_docdir}/%{name}
make %{?_smp_mflags}
@@ -79,6 +75,9 @@
mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
+mkdir -p %{buildroot}%{_mandir}/man1
+perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1
+perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1
install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
# info's dir file is not auto ignored on some systems
rm -rf %{buildroot}%{_infodir}/dir
++++++ automake.spec ++++++
--- /var/tmp/diff_new_pack.oF3wmq/_old 2013-02-27 06:42:26.000000000 +0100
+++ /var/tmp/diff_new_pack.oF3wmq/_new 2013-02-27 06:42:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package automake
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -16,15 +16,12 @@
#
-# PLEASE run pre_checkin.sh in this directory before submitting
-# this package. Otherwise the .spec and .changes for automake-testsuite
-# aren't updated.
-
Name: automake
BuildRequires: autoconf >= 2.69
BuildRequires: bison
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
+BuildRequires: help2man
BuildRequires: xz
%if "%{name}" == "automake-testsuite"
BuildRequires: libtool
@@ -34,7 +31,7 @@
%endif
Requires: autoconf >= 2.69
Requires: info
-Version: 1.13.1
+Version: 1.12.1
Release: 0
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
License: GPL-2.0+
@@ -43,8 +40,12 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: automake-%{version}.tar.xz
Source1: automake-rpmlintrc
-Patch2: automake-require_file.patch
-Patch100: automake-SuSE.patch
+Patch1: automake-SuSE.patch
+Patch3: automake-require_file.patch
+# this patch makes sure packages that do not call AM_PROG_MKDIR, but use $(mkdir_p) work
+# this patch should be removed after 12.2 is done, packages need to be fixed to use $(MKDIR_P)
+# or avoid autoreconf at all
+Patch4: automake-add-mkdir_p-temporarly.patch
BuildArch: noarch
%description
@@ -55,8 +56,9 @@
%prep
%setup -q -n automake-%{version}
-%patch2
-%patch100
+%patch1
+%patch3
+%patch4 -p1
%build
sh bootstrap.sh
@@ -79,6 +81,9 @@
mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
+mkdir -p %{buildroot}%{_mandir}/man1
+perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1
+perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1
install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
# info's dir file is not auto ignored on some systems
rm -rf %{buildroot}%{_infodir}/dir
++++++ automake-SuSE.patch ++++++
--- /var/tmp/diff_new_pack.oF3wmq/_old 2013-02-27 06:42:26.000000000 +0100
+++ /var/tmp/diff_new_pack.oF3wmq/_new 2013-02-27 06:42:26.000000000 +0100
@@ -1,8 +1,6 @@
-Index: lib/config.guess
-===================================================================
---- lib/config.guess.orig
-+++ lib/config.guess
-@@ -136,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+--- lib/config.guess.orig 2012-04-06 12:31:44.062249033 -0400
++++ lib/config.guess 2012-04-06 12:59:56.696088199 -0400
+@@ -138,6 +138,16 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
@@ -19,12 +17,7 @@
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -200,23 +210,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- exit ;;
- *:Bitrig:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
+@@ -202,19 +212,19 @@
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
@@ -49,7 +42,7 @@
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
-@@ -284,13 +294,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -282,13 +292,13 @@
echo alpha-dec-winnt3.5
exit ;;
Amiga*:UNIX_System_V:4.0:*)
@@ -66,16 +59,16 @@
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
-@@ -305,7 +315,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -303,7 +313,7 @@
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm*:riscos:*:*|arm*:RISCOS:*:*)
+ arm:riscos:*:*|arm:RISCOS:*:*)
- echo arm-unknown-riscos
+ echo arm-${VENDOR}-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
-@@ -413,7 +423,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -411,7 +421,7 @@
echo m68k-hades-mint${UNAME_RELEASE}
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
@@ -84,7 +77,7 @@
exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
-@@ -724,9 +734,9 @@ EOF
+@@ -722,9 +732,9 @@
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
@@ -96,7 +89,7 @@
fi
exit ;;
parisc*:Lites*:*:*)
-@@ -786,18 +796,18 @@ EOF
+@@ -784,18 +794,18 @@
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit ;;
sparc*:BSD/OS:*:*)
@@ -119,7 +112,7 @@
esac
exit ;;
i*:CYGWIN*:*)
-@@ -825,10 +835,10 @@ EOF
+@@ -820,10 +830,10 @@
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
authenticamd | genuineintel | EM64T)
@@ -132,7 +125,7 @@
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-@@ -847,31 +857,31 @@ EOF
+@@ -842,31 +852,31 @@
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
@@ -171,7 +164,7 @@
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -885,26 +895,26 @@ EOF
+@@ -880,26 +890,26 @@
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
@@ -203,7 +196,7 @@
exit ;;
cris:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-gnu
-@@ -913,10 +923,10 @@ EOF
+@@ -908,10 +918,10 @@
echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
@@ -216,7 +209,7 @@
exit ;;
i*86:Linux:*:*)
LIBC=gnu
-@@ -930,13 +940,13 @@ EOF
+@@ -925,13 +935,13 @@
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
@@ -233,7 +226,7 @@
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
-@@ -955,54 +965,54 @@ EOF
+@@ -950,54 +960,54 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
@@ -303,7 +296,7 @@
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -1024,16 +1034,16 @@ EOF
+@@ -1019,16 +1029,16 @@
echo ${UNAME_MACHINE}-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
@@ -323,7 +316,7 @@
exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
-@@ -1053,7 +1063,7 @@ EOF
+@@ -1048,7 +1058,7 @@
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
@@ -332,7 +325,7 @@
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
-@@ -1092,7 +1102,7 @@ EOF
+@@ -1087,7 +1097,7 @@
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
@@ -341,7 +334,7 @@
fi
exit ;;
mini*:CTIX:SYS*5:*)
-@@ -1129,19 +1139,19 @@ EOF
+@@ -1124,19 +1134,19 @@
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
@@ -365,7 +358,7 @@
exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
-@@ -1191,7 +1201,7 @@ EOF
+@@ -1186,7 +1196,7 @@
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
@@ -374,16 +367,7 @@
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
-@@ -1207,7 +1217,7 @@ EOF
- echo i586-pc-haiku
- exit ;;
- x86_64:Haiku:*:*)
-- echo x86_64-unknown-haiku
-+ echo x86_64-${VENDOR}-haiku
- exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
-@@ -1288,13 +1298,13 @@ EOF
+@@ -1280,13 +1290,13 @@
else
UNAME_MACHINE="$cputype"
fi
@@ -400,7 +384,7 @@
exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
-@@ -1303,16 +1313,16 @@ EOF
+@@ -1295,16 +1305,16 @@
echo pdp10-xkl-tops20
exit ;;
*:TOPS-20:*:*)
@@ -420,7 +404,7 @@
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1334,7 +1344,7 @@ EOF
+@@ -1326,7 +1336,7 @@
echo ${UNAME_MACHINE}-pc-aros
exit ;;
x86_64:VMkernel:*:*)
++++++ automake-add-mkdir_p-temporarly.patch ++++++
Index: automake-1.12.1/m4/init.m4
===================================================================
--- automake-1.12.1.orig/m4/init.m4 2012-06-01 15:47:10.000000000 +0200
+++ automake-1.12.1/m4/init.m4 2012-06-01 15:47:10.000000000 +0200
@@ -82,6 +82,7 @@ AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
++++++ automake-require_file.patch ++++++
--- /var/tmp/diff_new_pack.oF3wmq/_old 2013-02-27 06:42:26.000000000 +0100
+++ /var/tmp/diff_new_pack.oF3wmq/_new 2013-02-27 06:42:26.000000000 +0100
@@ -1,8 +1,8 @@
Index: automake.in
===================================================================
---- automake.in.orig
-+++ automake.in
-@@ -7750,12 +7750,14 @@ sub required_file_check_or_copy ($$$)
+--- automake.in.orig 2012-06-01 15:47:09.000000000 +0200
++++ automake.in 2012-07-04 09:17:39.816973055 +0200
+@@ -7751,12 +7751,14 @@ sub required_file_check_or_copy ($$$)
my $fullfile = "$dir/$file";
my $found_it = 0;
my $dangling_sym = 0;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package translation-update for openSUSE:12.3 checked in at 2013-02-26 17:37:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/translation-update (Old)
and /work/SRC/openSUSE:12.3/.translation-update.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "translation-update", Maintainer is "gnome-maintainers(a)suse.de"
Changes:
--------
--- /work/SRC/openSUSE:12.3/translation-update/translation-update.changes 2013-02-26 15:11:25.000000000 +0100
+++ /work/SRC/openSUSE:12.3/.translation-update.new/translation-update.changes 2013-02-26 17:37:34.000000000 +0100
@@ -2,17 +1,0 @@
-Mon Feb 18 18:01:25 CET 2013 - sbrabec(a)suse.cz
-
-- Set version to 12.3.
-- Added support for auto-generated
- translation-update-from-translation-update-upstream tarball
- with translation updates and added
- translation-update-from-translation-update-upstream-20130214.tar.bz2
-- Added support for last minute translations
- (translation-update2.tar.bz2).
-- Added two supplementary scripts that allow to generate package
- list dynamically (translation-update-reset-lang-list.sh,
- translation-update-generate-lang-list.sh).
-- Added translation-update.rpmlintrc.
-- Small improvements of %build and %install to run faster with
- cleaner log.
-
--------------------------------------------------------------------
Old:
----
translation-update-from-translation-update-upstream-20130214.tar.bz2
translation-update-generate-lang-list.sh
translation-update-reset-lang-list.sh
translation-update.rpmlintrc
translation-update2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ translation-update.spec ++++++
++++ 1383 lines (skipped)
++++ between /work/SRC/openSUSE:12.3/translation-update/translation-update.spec
++++ and /work/SRC/openSUSE:12.3/.translation-update.new/translation-update.spec
++++++ AUTHORS ++++++
--- /var/tmp/diff_new_pack.qJyxWo/_old 2013-02-26 17:37:34.000000000 +0100
+++ /var/tmp/diff_new_pack.qJyxWo/_new 2013-02-26 17:37:34.000000000 +0100
@@ -1,3 +1 @@
-Gary Ekker <gekker(a)novell.com>
-Karl Eichwalder <ke(a)suse.de>
-Stanislav Brabec <sbrabec(a)suse.cz>
+Gary Ekker <gekker(a)novell.com>
\ No newline at end of file
++++++ COPYING ++++++
--- /var/tmp/diff_new_pack.qJyxWo/_old 2013-02-26 17:37:34.000000000 +0100
+++ /var/tmp/diff_new_pack.qJyxWo/_new 2013-02-26 17:37:34.000000000 +0100
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -291,7 +291,7 @@
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (C) 19yy <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -305,7 +305,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package patchinfo.1362 for openSUSE:12.2:Update checked in at 2013-02-26 17:19:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/patchinfo.1362 (Old)
and /work/SRC/openSUSE:12.2:Update/.patchinfo.1362.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patchinfo.1362", Maintainer is ""
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_patchinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _patchinfo ++++++
<patchinfo>
<packager>wolfi323</packager>
<category>recommended</category>
<rating>low</rating>
<summary>kdebase4: Several fixes for kickoff</summary>
<description>This update fixes some issues with openSUSE's patches to the KDE application launcher ("Kickoff"):
- bnc#803179: sort entries by genericName if "Show applications by name" is switched off
- bnc#356553: add ":F" to the sortOrder list if it isn't included to make sure collapsed entries are really shown
- bnc#801416: in config dialog: connect added options to settingsModified() slot so that "Apply" button gets activated when they are changed by the user
- bnc#641916: display program icon instead of submenu icon when using reduced menu depth
- bnc#725829: don't set name to null if it is equal to genericName or genericName is empty</description>
<issue tracker="bnc" id="356553">Creating New KMenu Submenu Makes Single Sub-Menu Items Invisible in K-Menu and Kickoff</issue>
<issue tracker="bnc" id="641916">KMenu (Classic and Kickoff) displays submenu icon instead of program icon when using reduced menu depth</issue>
<issue tracker="bnc" id="725829">After checking "Show applications by name" in Kickoff settings, some menu entries display blank application names</issue>
<issue tracker="bnc" id="801416">opensuse patches for kde4 kickoff break kde4 classic menu</issue>
<issue tracker="bnc" id="803179">Kickoff: Wrong entry sort order if "Show applications by name" is switched off</issue>
</patchinfo>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0