openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
August 2008
- 1 participants
- 1192 discussions
Hello community,
here is the log from the commit of package xorg-x11-server
checked in at Thu Aug 7 01:37:06 CEST 2008.
--------
--- xorg-x11-server/xorg-x11-server.changes 2008-08-05 10:30:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2008-08-06 17:25:18.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 6 17:24:40 CEST 2008 - schwab(a)suse.de
+
+- Fix crash in Xvnc when handling selections.
+
+-------------------------------------------------------------------
New:
----
xorg-server-xf4vnc-cutpaste.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.A15333/_old 2008-08-07 01:36:26.000000000 +0200
+++ /var/tmp/diff_new_pack.A15333/_new 2008-08-07 01:36:26.000000000 +0200
@@ -29,7 +29,7 @@
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.3
-Release: 137
+Release: 139
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -76,6 +76,7 @@
Patch40: xorg-server-xf4vnc-disable-dmxvnc.diff
Patch42: xorg-server-xf4vnc-TranslateNone.diff
Patch43: xorg-server-xf4vnc-abi-version.diff
+Patch44: xorg-server-xf4vnc-cutpaste.diff
%endif
Patch41: loadmod-bug197195.diff
Patch45: bug-197858_dpms.diff
@@ -188,6 +189,7 @@
%patch40 -p0
%patch42 -p1
%patch43 -p0
+%patch44
chmod 755 hw/vnc/symlink-vnc.sh
%endif
%patch41 -p1
@@ -532,6 +534,8 @@
%endif
%changelog
+* Wed Aug 06 2008 schwab(a)suse.de
+- Fix crash in Xvnc when handling selections.
* Tue Aug 05 2008 sndirsch(a)suse.de
- enabled build of record extension, which has been disabled
upstream for whatever reason
++++++ xorg-server-xf4vnc-cutpaste.diff ++++++
--- hw/vnc/cutpaste.c
+++ hw/vnc/cutpaste.c
@@ -58,7 +58,7 @@ rfbSetXCutText(char *str, int len)
8, PropModeReplace, len,
(pointer)str, TRUE);
- if (dixLookupSelection(&pSel, XA_PRIMARY, serverClient, DixSetAttrAccess)) {
+ if (dixLookupSelection(&pSel, XA_PRIMARY, serverClient, DixSetAttrAccess) == Success) {
xEvent event;
if (pSel->client) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 tomcat6
checked in at Thu Aug 7 01:36:13 CEST 2008.
--------
--- tomcat6/tomcat6.changes 2008-07-21 15:46:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/tomcat6/tomcat6.changes 2008-08-06 11:12:18.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 6 11:11:58 CEST 2008 - mvyskocil(a)suse.cz
+
+- fix CVE-2008-1232 and CVE-2008-2370: VUL-0: Apache Tomcat Cross-Site
+ Scripting and Security Bypass [bnc#414657]
+
+-------------------------------------------------------------------
New:
----
apache-tomcat-CVE-2008-1232.patch
apache-tomcat-CVE-2008-2370.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libtcnative-1-0.spec ++++++
--- /var/tmp/diff_new_pack.h13643/_old 2008-08-07 01:36:01.000000000 +0200
+++ /var/tmp/diff_new_pack.h13643/_new 2008-08-07 01:36:01.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package libtcnative-1-0 (Version MACRO)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -22,7 +29,7 @@
Name: libtcnative-1-0
Version: %{major}.%{minor}.%{micro}
-Release: 2
+Release: 3
Summary: JNI wrappers for Apache Portable Runtime for Tomcat
Group: Productivity/Networking/Web/Servers
License: The Apache Software License
++++++ tomcat6.spec ++++++
--- /var/tmp/diff_new_pack.h13643/_old 2008-08-07 01:36:02.000000000 +0200
+++ /var/tmp/diff_new_pack.h13643/_new 2008-08-07 01:36:02.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package tomcat6 (Version MACRO)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -29,7 +36,7 @@
Name: tomcat6
Version: %{major_version}.%{minor_version}.%{macro_version}
-Release: 9
+Release: 10
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API
Group: Productivity/Networking/Web/Servers
License: The Apache Software License
@@ -41,6 +48,8 @@
Source4: %{name}-%{major_version}.%{minor_version}.wrapper
Patch0: %{name}-%{major_version}.%{minor_version}.bootstrap-MANIFEST.MF.patch
Patch1: apache-tomcat-CVE-2008-1947.patch
+Patch2: apache-tomcat-CVE-2008-2370.patch
+Patch3: apache-tomcat-CVE-2008-1232.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant
@@ -175,6 +184,8 @@
%setup -q -c -T -a 0
%patch0
%patch1 -b .sav1
+%patch2 -b .sav2
+%patch3 -b .sav3
%build
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}
@@ -448,6 +459,9 @@
%{appdir}/examples
%changelog
+* Wed Aug 06 2008 mvyskocil(a)suse.cz
+- fix CVE-2008-1232 and CVE-2008-2370: VUL-0: Apache Tomcat Cross-Site
+ Scripting and Security Bypass [bnc#414657]
* Mon Jul 21 2008 mvyskocil(a)suse.cz
- fixed [bnc#394503]: tomcat6 is missing rctomcat6 link
- add a /usr/sbin/rctomcat6 symlink
++++++ apache-tomcat-CVE-2008-1232.patch ++++++
--- apache-tomcat-6.0.16-src/java/org/apache/catalina/core/StandardContextValve.java
+++ apache-tomcat-6.0.16-src/java/org/apache/catalina/core/StandardContextValve.java
@@ -120,8 +120,7 @@
|| (requestPathMB.equalsIgnoreCase("/META-INF"))
|| (requestPathMB.startsWithIgnoreCase("/WEB-INF/", 0))
|| (requestPathMB.equalsIgnoreCase("/WEB-INF"))) {
- String requestURI = request.getDecodedRequestURI();
- notFound(requestURI, response);
+ notFound(response);
return;
}
@@ -138,7 +137,7 @@
Wrapper wrapper = request.getWrapper();
if (wrapper == null) {
String requestURI = request.getDecodedRequestURI();
- notFound(requestURI, response);
+ notFound(response);
return;
}
@@ -289,10 +288,10 @@
* @param requestURI The request URI for the requested resource
* @param response The response we are creating
*/
- private void notFound(String requestURI, HttpServletResponse response) {
+ private void notFound(HttpServletResponse response) {
try {
- response.sendError(HttpServletResponse.SC_NOT_FOUND, requestURI);
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (IllegalStateException e) {
;
} catch (IOException e) {
--- apache-tomcat-6.0.16-src/java/org/apache/coyote/Constants.java
+++ apache-tomcat-6.0.16-src/java/org/apache/coyote/Constants.java
@@ -59,6 +59,12 @@
public static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
-
+ /**
+ * If true, custom HTTP status messages will be used in headers.
+ */
+ public static final boolean USE_CUSTOM_STATUS_MSG_IN_HEADER =
+ Boolean.valueOf(System.getProperty(
+ "org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER",
+ "false")).booleanValue();
}
--- apache-tomcat-6.0.16-src/java/org/apache/coyote/ajp/AjpAprProcessor.java
+++ apache-tomcat-6.0.16-src/java/org/apache/coyote/ajp/AjpAprProcessor.java
@@ -917,7 +917,10 @@
// HTTP header contents
responseHeaderMessage.appendInt(response.getStatus());
- String message = response.getMessage();
+ String message = null;
+ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+ message = response.getMessage();
+ }
if (message == null){
message = HttpMessages.getMessage(response.getStatus());
} else {
--- apache-tomcat-6.0.16-src/java/org/apache/coyote/ajp/AjpProcessor.java
+++ apache-tomcat-6.0.16-src/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -923,7 +923,10 @@
// HTTP header contents
responseHeaderMessage.appendInt(response.getStatus());
- String message = response.getMessage();
+ String message = null;
+ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+ message = response.getMessage();
+ }
if (message == null){
message = HttpMessages.getMessage(response.getStatus());
} else {
--- apache-tomcat-6.0.16-src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
+++ apache-tomcat-6.0.16-src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
@@ -421,11 +421,14 @@
buf[pos++] = Constants.SP;
// Write message
- String message = response.getMessage();
+ String message = null;
+ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+ message = response.getMessage();
+ }
if (message == null) {
write(HttpMessages.getMessage(status));
} else {
- write(message);
+ write(message.replace('\n', ' ').replace('\r', ' '));
}
// End the response status line
--- apache-tomcat-6.0.16-src/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
+++ apache-tomcat-6.0.16-src/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
@@ -479,11 +479,14 @@
buf[pos++] = Constants.SP;
// Write message
- String message = response.getMessage();
+ String message = null;
+ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+ message = response.getMessage();
+ }
if (message == null) {
write(HttpMessages.getMessage(status));
} else {
- write(message);
+ write(message.replace('\n', ' ').replace('\r', ' '));
}
// End the response status line
--- apache-tomcat-6.0.16-src/java/org/apache/coyote/http11/InternalOutputBuffer.java
+++ apache-tomcat-6.0.16-src/java/org/apache/coyote/http11/InternalOutputBuffer.java
@@ -438,11 +438,14 @@
buf[pos++] = Constants.SP;
// Write message
- String message = response.getMessage();
+ String message = null;
+ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+ message = response.getMessage();
+ }
if (message == null) {
write(getMessage(status));
} else {
- write(message);
+ write(message.replace('\n', ' ').replace('\r', ' '));
}
// End the response status line
--- apache-tomcat-6.0.16-src/java/org/apache/jk/common/JkInputStream.java
+++ apache-tomcat-6.0.16-src/java/org/apache/jk/common/JkInputStream.java
@@ -272,7 +272,10 @@
outputMsg.appendByte(AjpConstants.JK_AJP13_SEND_HEADERS);
outputMsg.appendInt( res.getStatus() );
- String message=res.getMessage();
+ String message = null;
+ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+ message = res.getMessage();
+ }
if( message==null ){
message= HttpMessages.getMessage(res.getStatus());
} else {
++++++ apache-tomcat-CVE-2008-2370.patch ++++++
--- apache-tomcat-6.0.16-src/java/org/apache/catalina/core/ApplicationContext.java
+++ apache-tomcat-6.0.16-src/java/org/apache/catalina/core/ApplicationContext.java
@@ -368,10 +368,22 @@
throw new IllegalArgumentException
(sm.getString
("applicationContext.requestDispatcher.iae", path));
+
+ // Get query string
+ String queryString = null;
+ int pos = path.indexOf('?');
+ if (pos >= 0) {
+ queryString = path.substring(pos + 1);
+ } else {
+ pos = path.length();
+ }
+
path = normalize(path);
if (path == null)
return (null);
+ pos = path.length();
+
// Use the thread local URI and mapping data
DispatchData dd = dispatchData.get();
if (dd == null) {
@@ -382,14 +394,6 @@
MessageBytes uriMB = dd.uriMB;
uriMB.recycle();
- // Get query string
- String queryString = null;
- int pos = path.indexOf('?');
- if (pos >= 0) {
- queryString = path.substring(pos + 1);
- } else {
- pos = path.length();
- }
// Use the thread local mapping data
MappingData mappingData = dd.mappingData;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 tftp
checked in at Thu Aug 7 01:35:59 CEST 2008.
--------
--- tftp/tftp.changes 2008-07-18 18:00:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/tftp/tftp.changes 2008-08-06 16:05:50.375792000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 6 16:04:07 CEST 2008 - kkeil(a)suse.de
+
+- Update to current git version with enhanced IPv6 support included
+
+-------------------------------------------------------------------
Old:
----
tftp-hpa-0.48_ipv6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tftp.spec ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package tftp (Version 0.48)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -12,14 +19,14 @@
Name: tftp
-BuildRequires: libedit-devel tcpd-devel
+BuildRequires: binutils-devel libedit-devel tcpd-devel
Url: http://www.kernel.org/pub/software/network/tftp/
License: BSD 3-Clause
Group: Productivity/Networking/Ftp/Clients
Requires: inet-daemon netcfg
AutoReqProv: on
Version: 0.48
-Release: 82
+Release: 90
Summary: Trivial File Transfer Protocol (TFTP)
Source: tftp-hpa-git-%{version}.tar.bz2
Source1: tftp.xinetd
@@ -27,7 +34,6 @@
Patch1: tftp-hpa-0.46_colon_check.patch
Patch2: tftp-hpa-0.43_readline.diff
Patch3: tftp-hpa-0.46_libedit.patch
-Patch4: tftp-hpa-0.48_ipv6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -47,13 +53,12 @@
%patch1
%patch2
%patch3
-%patch4 -p1
%build
%{__make}
%install
-%makeinstall INSTALLROOT="%{buildroot}"
+%makeinstall INSTALLROOT="%{buildroot}" MANDIR="%{_mandir}"
%{__install} -D -m 0644 %{S:1} %{buildroot}/etc/xinetd.d/tftp
%clean
@@ -70,6 +75,8 @@
%config(noreplace) /etc/xinetd.d/tftp
%changelog
+* Wed Aug 06 2008 kkeil(a)suse.de
+- Update to current git version with enhanced IPv6 support included
* Fri Jul 18 2008 kkeil(a)suse.de
- Update to git version 0.48 for mainline compatibility; code is
still the same but formatting was cleaned up
++++++ tftp-hpa-0.43_include_sys_params.patch ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -8,5 +8,5 @@
#include <sys/file.h>
+#include <sys/param.h>
#include <ctype.h>
- #include <netdb.h>
#ifdef WITH_READLINE
+ #include <readline/readline.h>
++++++ tftp-hpa-0.43_readline.diff ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -5,7 +5,7 @@
===================================================================
--- configure.in.orig
+++ configure.in
-@@ -218,7 +218,7 @@ PA_WITH_BOOL(readline, 1,
+@@ -239,7 +239,7 @@ PA_WITH_BOOL(readline, 1,
AC_DEFINE(WITH_READLINE)
],
[],
++++++ tftp-hpa-0.46_colon_check.patch ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -2,8 +2,8 @@
===================================================================
--- tftp/main.c.orig
+++ tftp/main.c
-@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
- }
+@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
+
bsd_signal(SIGINT, intr);
- if (peerargc) {
@@ -11,7 +11,13 @@
/* Set peer */
if (sigsetjmp(toplevel, 1) != 0)
exit(EX_NOHOST);
-@@ -592,6 +592,9 @@ void get(int argc, char *argv[])
+@@ -634,11 +634,14 @@ void get(int argc, char *argv[])
+ return;
+ }
+ if (!connected) {
+- for (n = 1; n < argc; n++)
++ for (n = 1; n < argc; n++) {
+ if (literal || strchr(argv[n], ':') == 0) {
getusage(argv[0]);
return;
}
++++++ tftp-hpa-0.46_libedit.patch ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -2,9 +2,9 @@
===================================================================
--- configure.in.orig
+++ configure.in
-@@ -226,6 +226,29 @@ PA_WITH_BOOL(readline, 1,
- TFTP_LIBS="$LIBS $XTRALIBS"
- LIBS="$common_libs"
+@@ -268,6 +268,29 @@ PA_WITH_BOOL(ipv6, 1,
+ [AC_MSG_RESULT(disabled)])
+
+AH_TEMPLATE([WITH_EDITLINE],
+[Define if we are compiling with editline command-line editing.])
@@ -36,7 +36,7 @@
===================================================================
--- tftp/main.c.orig
+++ tftp/main.c
-@@ -48,6 +48,9 @@
+@@ -47,6 +47,9 @@
#include <readline/history.h>
#endif
#endif
@@ -46,7 +46,7 @@
#include "extern.h"
-@@ -81,7 +84,7 @@ int verbose;
+@@ -88,7 +91,7 @@ int verbose;
int literal;
int connected;
const struct modes *mode;
@@ -55,7 +55,7 @@
char *line = NULL;
#else
char line[LBUFLEN];
-@@ -321,8 +324,8 @@ int main(int argc, char *argv[])
+@@ -346,8 +349,8 @@ int main(int argc, char *argv[])
(*c->handler) (pargc, pargv);
exit(0);
}
@@ -66,7 +66,7 @@
using_history();
#endif
#endif
-@@ -340,7 +343,7 @@ char *hostname;
+@@ -365,7 +368,7 @@ char *hostname;
the global variable "line" */
static void getmoreargs(const char *partial, const char *mprompt)
{
@@ -75,7 +75,7 @@
char *eline;
int len, elen;
-@@ -360,7 +363,7 @@ static void getmoreargs(const char *part
+@@ -385,7 +388,7 @@ static void getmoreargs(const char *part
strcpy(line + len, eline);
free(eline);
@@ -84,7 +84,7 @@
add_history(line);
#endif
#else
-@@ -754,7 +757,7 @@ static void command(void)
+@@ -800,7 +803,7 @@ static void command(void)
struct cmd *c;
for (;;) {
@@ -93,7 +93,7 @@
if (line) {
free(line);
line = NULL;
-@@ -774,8 +777,8 @@ static void command(void)
+@@ -820,8 +823,8 @@ static void command(void)
#endif
if ((line[0] == 0) || (line[0] == '\n'))
continue;
@@ -108,7 +108,7 @@
===================================================================
--- config.h.orig
+++ config.h
-@@ -306,7 +306,7 @@ int daemon(int, int);
+@@ -350,7 +350,7 @@ const char *inet_ntop(int, const void *,
#include "version.h"
++++++ tftp-hpa-git-0.48.tar.bz2 ++++++
++++ 2797 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 talk
checked in at Thu Aug 7 01:35:47 CEST 2008.
--------
--- talk/talk.changes 2008-04-10 18:20:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/talk/talk.changes 2008-08-06 15:52:39.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 6 15:51:45 CEST 2008 - anosek(a)suse.cz
+
+- fixed Talk can't handle dots in user names (bnc#338368)
+ (dots_in_usernames.patch)
+
+-------------------------------------------------------------------
New:
----
netkit-ntalk-0.17-dots_in_usernames.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ talk.spec ++++++
--- /var/tmp/diff_new_pack.z11639/_old 2008-08-07 01:35:28.000000000 +0200
+++ /var/tmp/diff_new_pack.z11639/_new 2008-08-07 01:35:28.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package talk (Version 0.17)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -19,7 +26,7 @@
Provides: nkitb:/usr/bin/talk
AutoReqProv: on
Version: 0.17
-Release: 662
+Release: 684
Summary: Talk Client for Chatting with Another User
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
@@ -32,6 +39,7 @@
Patch2: netkit-ntalk-%{version}-alt-talkd.patch
Patch3: netkit-ntalk-%{version}-strip.diff
Patch4: netkit-ntalk-%{version}-dont-resolve.patch
+Patch5: netkit-n%{name}-0.17-dots_in_usernames.patch
%global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo ${1})
%description
@@ -44,7 +52,7 @@
%package server
License: BSD 3-Clause
Version: 0.17
-Release: 662
+Release: 684
Summary: Talk Daemon to Chat with Another User
Group: Productivity/Networking/Talk/Servers
Requires: net-tools netcfg
@@ -65,6 +73,7 @@
%patch2 -p1
%patch3
%patch4
+%patch5
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure
@@ -107,6 +116,9 @@
%{_fwdefdir}/talkd
%changelog
+* Wed Aug 06 2008 anosek(a)suse.cz
+- fixed Talk can't handle dots in user names (bnc#338368)
+ (dots_in_usernames.patch)
* Thu Apr 10 2008 werner(a)suse.de
- Use correct header for libncursesw
* Thu Mar 29 2007 dmueller(a)suse.de
++++++ netkit-ntalk-0.17-dots_in_usernames.patch ++++++
--- talk/get_names.c
+++ talk/get_names.c
@@ -80,7 +80,7 @@
my_machine_name = hostname;
/* check for, and strip out, the machine name of the target */
names = strdup(argv[1]);
- for (cp = names; *cp && !index("@:!.", *cp); cp++)
+ for (cp = names; *cp && !index("@:!", *cp); cp++)
;
if (*cp == '\0') {
/* this is a local to local talk */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 sendmail
checked in at Thu Aug 7 01:35:22 CEST 2008.
--------
--- sendmail/sendmail.changes 2008-07-30 16:04:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/sendmail/sendmail.changes 2008-08-06 13:41:49.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 6 13:41:29 CEST 2008 - varkoly(a)suse.de
+
+- (bnc#414960) – sendmail doesn't have any "Name: " tag in firewall definition
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sendmail.spec ++++++
--- /var/tmp/diff_new_pack.kV8640/_old 2008-08-07 01:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.kV8640/_new 2008-08-07 01:34:40.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package sendmail (Version 8.14.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -31,7 +38,7 @@
Obsoletes: sendmail-tls
AutoReqProv: on
Version: 8.14.3
-Release: 21
+Release: 26
Summary: BSD Sendmail
#Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.bz2
Source0: sendmail-%{version}.tar.bz2
@@ -81,7 +88,7 @@
%package -n rmail
Version: 8.14.3
-Release: 21
+Release: 26
Summary: Rmail of the BSD Sendmail
License: Any permissive
Group: Productivity/Networking/Email/Servers
@@ -457,6 +464,8 @@
%doc %{_mandir}/man8/rmail.8.gz
%changelog
+* Wed Aug 06 2008 varkoly(a)suse.de
+- (bnc#414960) – sendmail doesn't have any "Name: " tag in firewall definition
* Wed Jul 30 2008 werner(a)suse.de
- Make boot script know about new upcoming startpar and insserv
* Wed Jul 16 2008 werner(a)suse.de
++++++ uucp.spec ++++++
--- /var/tmp/diff_new_pack.kV8640/_old 2008-08-07 01:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.kV8640/_new 2008-08-07 01:34:40.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package uucp (Version 1.07)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -19,7 +26,7 @@
Recommends: stunnel
AutoReqProv: on
Version: 1.07
-Release: 403
+Release: 407
Summary: Taylor UUCP
Source0: uucp-1.07.tar.bz2
Source1: uucpcfg.tar.bz2
++++++ sendmail-8.14.3.dif ++++++
--- /var/tmp/diff_new_pack.kV8640/_old 2008-08-07 01:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.kV8640/_new 2008-08-07 01:34:41.000000000 +0200
@@ -2993,7 +2993,8 @@
+# (this is a <TAB> stop)
--- suse/fw
+++ suse/fw 2007-04-24 18:41:14.000000000 +0200
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
++## Name: SMTP with sendmail
+## Description: Firewall Configuration file for postfix
+
+# space separated list of allowed TCP ports
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 speex
checked in at Thu Aug 7 01:35:19 CEST 2008.
--------
--- speex/speex.changes 2008-04-10 13:00:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/speex/speex.changes 2008-08-06 13:40:50.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Aug 6 13:39:30 CEST 2008 - tiwai(a)suse.de
+
+- updated to version 1.2rc1:
+ * support for acoustic echo cancellation with multiple mics
+ and speakers.
+ * add an API to decorrelate loudspeaker signals
+ * fixes for a few bugs in the echo canceller, jitter buffer and
+ preprocessor
+
+-------------------------------------------------------------------
Old:
----
speex-1.2beta3.tar.bz2
New:
----
speex-1.2rc1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ speex.spec ++++++
--- /var/tmp/diff_new_pack.sa9178/_old 2008-08-07 01:34:57.000000000 +0200
+++ /var/tmp/diff_new_pack.sa9178/_new 2008-08-07 01:34:57.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package speex (Version 1.1.99.3)
+# spec file for package speex (Version 1.1.99.91)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -12,11 +19,11 @@
Name: speex
-%define package_version 1.2beta3
+%define package_version 1.2rc1
BuildRequires: libogg-devel pkgconfig
Summary: An Open Source, Patent Free Speech Codec
-Version: 1.1.99.3
-Release: 19
+Version: 1.1.99.91
+Release: 1
License: BSD 3-Clause
Group: System/Libraries
Url: http://www.speex.org/
@@ -102,11 +109,9 @@
# remove unneeded *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-%post -n libspeex
-%run_ldconfig
+%post -n libspeex -p /sbin/ldconfig
-%postun -n libspeex
-%run_ldconfig
+%postun -n libspeex -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
@@ -132,6 +137,13 @@
%{_datadir}/aclocal/*.m4
%changelog
+* Wed Aug 06 2008 tiwai(a)suse.de
+- updated to version 1.2rc1:
+ * support for acoustic echo cancellation with multiple mics
+ and speakers.
+ * add an API to decorrelate loudspeaker signals
+ * fixes for a few bugs in the echo canceller, jitter buffer and
+ preprocessor
* Thu Apr 10 2008 ro(a)suse.de
- added baselibs.conf file to build xxbit packages
for multilib support
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 postfix
checked in at Thu Aug 7 01:34:34 CEST 2008.
--------
--- postfix/postfix.changes 2008-07-09 15:12:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/postfix/postfix.changes 2008-08-06 13:36:06.527530000 +0200
@@ -1,0 +2,17 @@
+Wed Aug 6 13:33:01 CEST 2008 - varkoly(a)suse.de
+
+- (bnc#414959) postfix doesn't have any "Name: " tag in firewall definition
+- (bnc#405900) SuSEconfig.postfix changes owner and permissions of
+ /tmp if smtpd_tls_CApath is not set
+
+- Update to Version 2.5 patchlevel 3
+ * Cleanup of code
+ * defer delivery when a mailbox file is not owned by the recipient.
+ Requested by Sebastian Krahmer, SuSE.
+ Specify "strict_mailbox_ownership=no" to ignore ownership discrepancies.
+ * Bugfix: null-terminate CN comment string after sanitization.
+ * Bugfix (introduced Postfix 2.0): after "warn_if_reject
+ reject_unlisted_recipient/sender", the SMTP server mistakenly
+ remembered that recipient/sender validation was already done.
+
+-------------------------------------------------------------------
Old:
----
postfix-2.5.1.tar.gz
New:
----
postfix-2.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ postfix.spec ++++++
--- /var/tmp/diff_new_pack.eW5282/_old 2008-08-07 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.eW5282/_new 2008-08-07 01:34:04.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package postfix (Version 2.5.1)
+# spec file for package postfix (Version 2.5.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -24,8 +31,8 @@
Conflicts: sendmail exim
AutoReqProv: on
Summary: A fast, secure, and flexible mailer
-Version: 2.5.1
-Release: 34
+Version: 2.5.3
+Release: 1
Source: postfix-%{version}.tar.gz
Source1: postfix-SuSE.tar.gz
Patch: dynamic_maps.patch
@@ -41,7 +48,6 @@
Summary: postfix plugin to support MySQL maps
AutoReqProv: on
Group: Productivity/Networking/Email/Servers
-Prefix: %{_prefix}
PreReq: %{name} = %{version}
#
@@ -50,7 +56,6 @@
Summary: postfix plugin to support PostgreSQL maps
AutoReqProv: on
Group: Productivity/Networking/Email/Servers
-Prefix: %{_prefix}
PreReq: %{name} = %{version}
#
@@ -67,7 +72,7 @@
%define pf_config_directory /etc/postfix
%define pf_daemon_directory /usr/lib/postfix
%define pf_command_directory /usr/sbin
-%define pf_queue_directory /var/spool/postfix
+%define pf_queue_directory var/spool/postfix
%define pf_sendmail_path /usr/sbin/sendmail
%define pf_newaliases_path /usr/bin/newaliases
%define pf_mailq_path /usr/bin/mailq
@@ -127,7 +132,7 @@
%install
/usr/sbin/groupadd -g %{postfix_gid} -o -r postfix 2> /dev/null || :
/usr/sbin/groupadd -g %{maildrop_gid} -o -r maildrop 2> /dev/null || :
-/usr/sbin/useradd -r -o -g postfix -u %{postfix_uid} -s /bin/false -c "Postfix Daemon" -d /var/spool/postfix postfix 2> /dev/null || :
+/usr/sbin/useradd -r -o -g postfix -u %{postfix_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} postfix 2> /dev/null || :
mkdir -p $RPM_BUILD_ROOT/%{_libdir}
install lib/*.1 $RPM_BUILD_ROOT/%{_libdir}
for i in $RPM_BUILD_ROOT/%{_libdir}/*.1; do
@@ -145,7 +150,7 @@
config_directory=%{pf_config_directory} \
daemon_directory=%{pf_daemon_directory} \
command_directory=%{pf_command_directory} \
- queue_directory=%{pf_queue_directory} \
+ queue_directory=/%{pf_queue_directory} \
sendmail_path=%{pf_sendmail_path} \
newaliases_path=%{pf_newaliases_path} \
mailq_path=%{pf_mailq_path} \
@@ -200,7 +205,7 @@
install -m 600 postfix-SuSE/smtpd.conf $RPM_BUILD_ROOT/etc/sasl2/smtpd.conf
install -m 644 postfix-SuSE/openssl_postfix.conf.in $RPM_BUILD_ROOT/etc/postfix/openssl_postfix.conf.in
install -m 755 postfix-SuSE/mkpostfixcert $RPM_BUILD_ROOT/usr/sbin/mkpostfixcert
-rm -rf $RPM_BUILD_ROOT/var/spool/postfix
+rm -rf $RPM_BUILD_ROOT/%{pf_queue_directory}
install -m 644 postfix-SuSE/master.cf $RPM_BUILD_ROOT/%{conf_backup_dir}/master.cf
mkdir -p $RPM_BUILD_ROOT/%{omc_dir}
install -m 644 postfix-SuSE/postfix.xml $RPM_BUILD_ROOT/%{omc_dir}
@@ -258,7 +263,7 @@
\$queue_directory*)
path=${path/\$queue_directory/\/var\/spool\/postfix}
group=${group/-/root}
- echo "%dir %attr($mode,$owner,$group) $path" >> %{postfixfiles}
+ echo "%dir %attr($mode,$owner,$group) $path/" >> %{postfixfiles}
mkdir -m $mode -p $RPM_BUILD_ROOT/$path
printf '%%-38s %%-18s %%04d\n' $path "${owner}.${group}" $mode >> $RPM_BUILD_ROOT/etc/permissions.d/postfix
;;
@@ -278,8 +283,8 @@
%pre
VERSIONTEST=$(test -x usr/sbin/postconf && usr/sbin/postconf proxy_read_maps 2>/dev/null)
-if [ -z "$VERSIONTEST" -a -f var/spool/postfix/pid/master.pid ]; then
- if checkproc -p var/spool/postfix/pid/master.pid usr/lib/postfix/master; then
+if [ -z "$VERSIONTEST" -a -f %{pf_queue_directory}/pid/master.pid ]; then
+ if checkproc -p %{pf_queue_directory}/pid/master.pid usr/lib/postfix/master; then
echo "postfix is still running. You have to stop postfix in order to"
echo "install a newer version."
exit 1
@@ -287,7 +292,7 @@
fi
/usr/sbin/groupadd -g %{postfix_gid} -o -r postfix 2> /dev/null || :
/usr/sbin/groupadd -g %{maildrop_gid} -o -r maildrop 2> /dev/null || :
-/usr/sbin/useradd -r -o -g postfix -u %{postfix_uid} -s /bin/false -c "Postfix Daemon" -d /var/spool/postfix postfix 2> /dev/null || :
+/usr/sbin/useradd -r -o -g postfix -u %{postfix_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} postfix 2> /dev/null || :
%if %suse_version >= 900
%preun
@@ -419,6 +424,7 @@
%restart_on_update postfix
%endif
%insserv_cleanup
+ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
@@ -557,7 +563,8 @@
Wietse Venema <wietse(a)porcupine.org>
%description mysql
-postfix plugin to support MySQL maps
+Postfix plugin to support MySQL maps. This library will be loaded by
+starting postfix if you'll access a postmap which is stored in mysql.
@@ -566,7 +573,9 @@
Wietse Venema <wietse(a)porcupine.org>
%description postgresql
-postfix plugin to support PostgreSQL maps
+Postfix plugin to support PostgreSQL maps. This library will be loaded
+by starting postfix if you'll access a postmap which is stored in
+PostgreSQL.
@@ -584,6 +593,19 @@
Wietse Venema <wietse(a)porcupine.org>
%changelog
+* Wed Aug 06 2008 varkoly(a)suse.de
+- (bnc#414959) postfix doesn't have any "Name: " tag in firewall definition
+- (bnc#405900) SuSEconfig.postfix changes owner and permissions of
+ /tmp if smtpd_tls_CApath is not set
+- Update to Version 2.5 patchlevel 3
+ * Cleanup of code
+ * defer delivery when a mailbox file is not owned by the recipient.
+ Requested by Sebastian Krahmer, SuSE.
+ Specify "strict_mailbox_ownership=no" to ignore ownership discrepancies.
+ * Bugfix: null-terminate CN comment string after sanitization.
+ * Bugfix (introduced Postfix 2.0): after "warn_if_reject
+ reject_unlisted_recipient/sender", the SMTP server mistakenly
+ remembered that recipient/sender validation was already done.
* Wed Jul 09 2008 varkoly(a)suse.de
- (fate#305005) Enable SMTPS in postfix ootb
* Tue Jun 17 2008 varkoly(a)suse.de
++++++ postfix-2.5.1.tar.gz -> postfix-2.5.3.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/HISTORY new/postfix-2.5.3/HISTORY
--- old/postfix-2.5.1/HISTORY 2008-02-11 01:36:18.000000000 +0100
+++ new/postfix-2.5.3/HISTORY 2008-07-27 22:45:34.000000000 +0200
@@ -14297,10 +14297,6 @@
main.cf when "postfix start" is invoked with an obsolete
postfix command. File: conf/post-install.
- Workaround (introduced 20071204): update the wrong proxywrite
- process limit when upgrading an already installed default
- master.cf file. File: conf/post-install.
-
20080207
Cleanup: soft_bounce support for multi-line Milter replies.
@@ -14312,3 +14308,106 @@
Cleanup: multi-line support in SMTP server replies. File:
smtpd/smtpd_chat.c.
+20080215
+
+ Safety: break SASL loop in case both the SASL library and
+ the remote SMTP server are confused. File: smtp/smtp_sasl_glue.c.
+
+20080220
+
+ Safety: the master daemon now sets an exclusive lock on a
+ file $data_directory/master.lock, so that the data directory
+ can't be shared between multiple Postfix instances. This
+ would corrupt files that rely on single-writer updates
+ (examples: verify(8) cache, tlsmgr(8) caches, etc.). File:
+ master/master.c.
+
+20080228
+
+ Bugfix: bounce(8) segfault on one-line template text.
+ Problem found by Sacha Chlytor. File: bounce/bounce_template.c.
+
+20080310
+
+ Safety: the SMTP server's Dovecot authentication client now
+ enforces the SASL mechanism output filter also on client
+ command input. File: src/xsasl/xsasl_dovecot_server.c.
+
+20080311
+
+ Bugfix (introduced 20070811): the MAIL and RCPT Milter
+ application call-backs no longer received {mail_addr} or
+ {rcpt_addr} information. Problem reported by Anton Yuzhaninov.
+ File: smtpd/smtpd.c.
+
+20080318
+
+ Human factors: the PCRE and regexp maps now give more
+ comprehensible error messages when people make the common
+ mistake of indenting if/endif blocks. Files: util/dict_pcre.c,
+ util/dict_regexp.c.
+
+20080411
+
+ Bugfix (introduced Postfix 2.0): after "warn_if_reject
+ reject_unlisted_recipient/sender", the SMTP server mistakenly
+ remembered that recipient/sender validation was already
+ done. File: smtpd/smtpd_check.c.
+
+ Bugfix (introduced Postfix 2.3): the queue manager would
+ initialize missing client logging attributes (from xforward)
+ with real client attributes. Fix: enable this backwards
+ compatibility feature only with queue files that don't
+ contain logging attributes. Problem reported by Liviu Daia.
+ Files *qmgr/qmgr_message.c.
+
+20080424
+
+ Cleanup: some warning messages said "regexp" or "regexp
+ map" instead of "pcre map". File: util/dict_pcre.c.
+
+20080428
+
+ Cleanup: the proxy_read_maps (Postfix 2.0) default setting
+ was not updated when adding sender/recipient_bcc_maps
+ (Postfix 2.1) and smtp/lmtp_generic_maps (Postfix 2.3).
+ File: global/mail_params.h.
+
+ Cleanup: the SMTP server's XFORWARD and XCLIENT support was
+ not updated when the smtpd_client_port_logging configuration
+ parameter was added. Code by Victor Duchovni. Files:
+ smtpd/smtpd.c, smtpd/smtpd_peer.c.
+
+20080509
+
+ Bugfix: null-terminate CN comment string after sanitization.
+ File: smtpd/smtpd.c.
+
+20080603
+
+ Workaround: avoid "bad address pattern" errors with non-address
+ patterns in namadr_list_match() calls. File: util/match_ops.c.
+
+20080620
+
+ Bugfix (introduced 20080207): "cleanup -v" panic because
+ the new "SMTP reply" request flag did not have a printable
+ name. File: global/cleanup_strflags.c.
+
+ Cleanup: using "Before-queue content filter", RFC3848
+ information was not added to the headers. Carlos Velasco.
+ File smtpd/smtpd.c.
+
+20080717
+
+ Cleanup: a poorly-implemented integer overflow check for
+ TCP MSS calculation had the unexpected effect that people
+ broke Postfix on LP64 systems while attempting to silence
+ a compiler warning. File: util/vstream_tweak.c.
+
+20080725
+
+ Paranoia: defer delivery when a mailbox file is not owned
+ by the recipient. Requested by Sebastian Krahmer, SuSE.
+ Specify "strict_mailbox_ownership=no" to ignore ownership
+ discrepancies. Files: local/mailbox.c, virtual/mailbox.c.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/html/ADDRESS_VERIFICATION_README.html new/postfix-2.5.3/html/ADDRESS_VERIFICATION_README.html
--- old/postfix-2.5.1/html/ADDRESS_VERIFICATION_README.html 2008-02-14 01:41:16.000000000 +0100
+++ new/postfix-2.5.3/html/ADDRESS_VERIFICATION_README.html 2008-05-09 02:11:57.000000000 +0200
@@ -207,9 +207,10 @@
transferred. Postfix address verification does not work with such
sites. </p>
-<li> <p> By default, Postfix probe messages have "postmaster@$<a href="postconf.5.html#myorigin">myorigin</a>"
-as the sender address. This is SAFE because the Postfix SMTP server
-does not reject mail for this address. </p>
+<li> <p> By default, Postfix probe messages have "double-bounce@$<a href="postconf.5.html#myorigin">myorigin</a>"
+as the sender address (with Postfix versions before 2.5, the default
+is "postmaster@$<a href="postconf.5.html#myorigin">myorigin</a>"). This is SAFE because the Postfix SMTP
+server does not reject mail for this address. </p>
<p> You can change this into the null address ("<a href="postconf.5.html#address_verify_sender">address_verify_sender</a>
="). This is UNSAFE because address probes will fail with
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/html/local.8.html new/postfix-2.5.3/html/local.8.html
--- old/postfix-2.5.1/html/local.8.html 2008-01-08 23:22:42.000000000 +0100
+++ new/postfix-2.5.3/html/local.8.html 2008-07-27 22:30:39.000000000 +0200
@@ -398,60 +398,66 @@
attempt; do not update the Delivered-To: address
while expanding aliases or .forward files.
+ Available in Postfix version 2.5.3 and later:
+
+ <b><a href="postconf.5.html#strict_mailbox_ownership">strict_mailbox_ownership</a> (yes)</b>
+ Defer delivery when a mailbox file is not owned by
+ its recipient.
+
<b>DELIVERY METHOD CONTROLS</b>
- The precedence of <a href="local.8.html"><b>local</b>(8)</a> delivery methods from high to
- low is: aliases, .forward files, <a href="postconf.5.html#mailbox_transport_maps">mailbox_transport_maps</a>,
- <a href="postconf.5.html#mailbox_transport">mailbox_transport</a>, <a href="postconf.5.html#mailbox_command_maps">mailbox_command_maps</a>, <a href="postconf.5.html#mailbox_command">mailbox_command</a>,
- <a href="postconf.5.html#home_mailbox">home_mailbox</a>, <a href="postconf.5.html#mail_spool_directory">mail_spool_directory</a>, fallback_trans-
+ The precedence of <a href="local.8.html"><b>local</b>(8)</a> delivery methods from high to
+ low is: aliases, .forward files, <a href="postconf.5.html#mailbox_transport_maps">mailbox_transport_maps</a>,
+ <a href="postconf.5.html#mailbox_transport">mailbox_transport</a>, <a href="postconf.5.html#mailbox_command_maps">mailbox_command_maps</a>, <a href="postconf.5.html#mailbox_command">mailbox_command</a>,
+ <a href="postconf.5.html#home_mailbox">home_mailbox</a>, <a href="postconf.5.html#mail_spool_directory">mail_spool_directory</a>, fallback_trans-
port_maps, <a href="postconf.5.html#fallback_transport">fallback_transport</a>, and <a href="postconf.5.html#luser_relay">luser_relay</a>.
<b><a href="postconf.5.html#alias_maps">alias_maps</a> (see 'postconf -d' output)</b>
- The alias databases that are used for <a href="local.8.html"><b>local</b>(8)</a>
+ The alias databases that are used for <a href="local.8.html"><b>local</b>(8)</a>
delivery.
<b><a href="postconf.5.html#forward_path">forward_path</a> (see 'postconf -d' output)</b>
The <a href="local.8.html"><b>local</b>(8)</a> delivery agent search list for finding
- a .forward file with user-specified delivery meth-
+ a .forward file with user-specified delivery meth-
ods.
<b><a href="postconf.5.html#mailbox_transport_maps">mailbox_transport_maps</a> (empty)</b>
- Optional lookup tables with per-recipient message
- delivery transports to use for <a href="local.8.html"><b>local</b>(8)</a> mailbox
- delivery, whether or not the recipients are found
+ Optional lookup tables with per-recipient message
+ delivery transports to use for <a href="local.8.html"><b>local</b>(8)</a> mailbox
+ delivery, whether or not the recipients are found
in the UNIX passwd database.
<b><a href="postconf.5.html#mailbox_transport">mailbox_transport</a> (empty)</b>
- Optional message delivery transport that the
- <a href="local.8.html"><b>local</b>(8)</a> delivery agent should use for mailbox
- delivery to all local recipients, whether or not
+ Optional message delivery transport that the
+ <a href="local.8.html"><b>local</b>(8)</a> delivery agent should use for mailbox
+ delivery to all local recipients, whether or not
they are found in the UNIX passwd database.
<b><a href="postconf.5.html#mailbox_command_maps">mailbox_command_maps</a> (empty)</b>
- Optional lookup tables with per-recipient external
+ Optional lookup tables with per-recipient external
commands to use for <a href="local.8.html"><b>local</b>(8)</a> mailbox delivery.
<b><a href="postconf.5.html#mailbox_command">mailbox_command</a> (empty)</b>
- Optional external command that the <a href="local.8.html"><b>local</b>(8)</a> deliv-
+ Optional external command that the <a href="local.8.html"><b>local</b>(8)</a> deliv-
ery agent should use for mailbox delivery.
<b><a href="postconf.5.html#home_mailbox">home_mailbox</a> (empty)</b>
- Optional pathname of a mailbox file relative to a
+ Optional pathname of a mailbox file relative to a
<a href="local.8.html"><b>local</b>(8)</a> user's home directory.
<b><a href="postconf.5.html#mail_spool_directory">mail_spool_directory</a> (see 'postconf -d' output)</b>
- The directory where <a href="local.8.html"><b>local</b>(8)</a> UNIX-style mailboxes
+ The directory where <a href="local.8.html"><b>local</b>(8)</a> UNIX-style mailboxes
are kept.
<b><a href="postconf.5.html#fallback_transport_maps">fallback_transport_maps</a> (empty)</b>
- Optional lookup tables with per-recipient message
- delivery transports for recipients that the
- <a href="local.8.html"><b>local</b>(8)</a> delivery agent could not find in the
+ Optional lookup tables with per-recipient message
+ delivery transports for recipients that the
+ <a href="local.8.html"><b>local</b>(8)</a> delivery agent could not find in the
<a href="aliases.5.html"><b>aliases</b>(5)</a> or UNIX password database.
<b><a href="postconf.5.html#fallback_transport">fallback_transport</a> (empty)</b>
- Optional message delivery transport that the
- <a href="local.8.html"><b>local</b>(8)</a> delivery agent should use for names that
- are not found in the <a href="aliases.5.html"><b>aliases</b>(5)</a> or UNIX password
+ Optional message delivery transport that the
+ <a href="local.8.html"><b>local</b>(8)</a> delivery agent should use for names that
+ are not found in the <a href="aliases.5.html"><b>aliases</b>(5)</a> or UNIX password
database.
<b><a href="postconf.5.html#luser_relay">luser_relay</a> (empty)</b>
@@ -461,7 +467,7 @@
Available in Postfix version 2.2 and later:
<b><a href="postconf.5.html#command_execution_directory">command_execution_directory</a> (empty)</b>
- The <a href="local.8.html"><b>local</b>(8)</a> delivery agent working directory for
+ The <a href="local.8.html"><b>local</b>(8)</a> delivery agent working directory for
delivery to external command.
<b>MAILBOX LOCKING CONTROLS</b>
@@ -470,15 +476,15 @@
sive lock on a mailbox file or <a href="bounce.8.html"><b>bounce</b>(8)</a> logfile.
<b><a href="postconf.5.html#deliver_lock_delay">deliver_lock_delay</a> (1s)</b>
- The time between attempts to acquire an exclusive
+ The time between attempts to acquire an exclusive
lock on a mailbox file or <a href="bounce.8.html"><b>bounce</b>(8)</a> logfile.
<b><a href="postconf.5.html#stale_lock_time">stale_lock_time</a> (500s)</b>
- The time after which a stale exclusive mailbox
+ The time after which a stale exclusive mailbox
lockfile is removed.
<b><a href="postconf.5.html#mailbox_delivery_lock">mailbox_delivery_lock</a> (see 'postconf -d' output)</b>
- How to lock a UNIX-style <a href="local.8.html"><b>local</b>(8)</a> mailbox before
+ How to lock a UNIX-style <a href="local.8.html"><b>local</b>(8)</a> mailbox before
attempting delivery.
<b>RESOURCE AND RATE CONTROLS</b>
@@ -486,17 +492,17 @@
Time limit for delivery to external commands.
<b><a href="postconf.5.html#duplicate_filter_limit">duplicate_filter_limit</a> (1000)</b>
- The maximal number of addresses remembered by the
- address duplicate filter for <a href="aliases.5.html"><b>aliases</b>(5)</a> or <a href="virtual.5.html"><b>vir-</b></a>
+ The maximal number of addresses remembered by the
+ address duplicate filter for <a href="aliases.5.html"><b>aliases</b>(5)</a> or <a href="virtual.5.html"><b>vir-</b></a>
<a href="virtual.5.html"><b>tual</b>(5)</a> alias expansion, or for <a href="showq.8.html"><b>showq</b>(8)</a> queue dis-
plays.
<b><a href="postconf.5.html#local_destination_concurrency_limit">local_destination_concurrency_limit</a> (2)</b>
- The maximal number of parallel deliveries via the
+ The maximal number of parallel deliveries via the
local mail delivery transport to the same recipient
- (when "<a href="postconf.5.html#local_destination_recipient_limit">local_destination_recipient_limit</a> = 1") or
- the maximal number of parallel deliveries to the
- same <a href="ADDRESS_CLASS_README.html#local_domain_class">local domain</a> (when "local_destination_recipi-
+ (when "<a href="postconf.5.html#local_destination_recipient_limit">local_destination_recipient_limit</a> = 1") or
+ the maximal number of parallel deliveries to the
+ same <a href="ADDRESS_CLASS_README.html#local_domain_class">local domain</a> (when "local_destination_recipi-
ent_limit > 1").
<b><a href="postconf.5.html#local_destination_recipient_limit">local_destination_recipient_limit</a> (1)</b>
@@ -509,33 +515,39 @@
<b>SECURITY CONTROLS</b>
<b><a href="postconf.5.html#allow_mail_to_commands">allow_mail_to_commands</a> (alias, forward)</b>
- Restrict <a href="local.8.html"><b>local</b>(8)</a> mail delivery to external com-
+ Restrict <a href="local.8.html"><b>local</b>(8)</a> mail delivery to external com-
mands.
<b><a href="postconf.5.html#allow_mail_to_files">allow_mail_to_files</a> (alias, forward)</b>
- Restrict <a href="local.8.html"><b>local</b>(8)</a> mail delivery to external files.
+ Restrict <a href="local.8.html"><b>local</b>(8)</a> mail delivery to external files.
<b><a href="postconf.5.html#command_expansion_filter">command_expansion_filter</a> (see 'postconf -d' output)</b>
- Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery
- agent allows in $name expansions of $<a href="postconf.5.html#mailbox_command">mailbox_com</a>-
- <a href="postconf.5.html#mailbox_command">mand</a>.
+ Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery
+ agent allows in $name expansions of $<a href="postconf.5.html#mailbox_command">mailbox_com</a>-
+ <a href="postconf.5.html#mailbox_command">mand</a> and $<a href="postconf.5.html#command_execution_directory">command_execution_directory</a>.
<b><a href="postconf.5.html#default_privs">default_privs</a> (nobody)</b>
- The default rights used by the <a href="local.8.html"><b>local</b>(8)</a> delivery
+ The default rights used by the <a href="local.8.html"><b>local</b>(8)</a> delivery
agent for delivery to external file or command.
<b><a href="postconf.5.html#forward_expansion_filter">forward_expansion_filter</a> (see 'postconf -d' output)</b>
- Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery
- agent allows in $name expansions of $<a href="postconf.5.html#forward_path">forward_path</a>.
+ Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery
+ agent allows in $name expansions of $<a href="postconf.5.html#forward_path">forward_path</a>.
Available in Postfix version 2.2 and later:
<b><a href="postconf.5.html#execution_directory_expansion_filter">execution_directory_expansion_filter</a> (see 'postconf -d'</b>
<b>output)</b>
- Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery
+ Restrict the characters that the <a href="local.8.html"><b>local</b>(8)</a> delivery
agent allows in $name expansions of $<a href="postconf.5.html#command_execution_directory">command_execu</a>-
<a href="postconf.5.html#command_execution_directory">tion_directory</a>.
+ Available in Postfix version 2.5.3 and later:
+
+ <b><a href="postconf.5.html#strict_mailbox_ownership">strict_mailbox_ownership</a> (yes)</b>
+ Defer delivery when a mailbox file is not owned by
+ its recipient.
+
<b>MISCELLANEOUS CONTROLS</b>
<b><a href="postconf.5.html#config_directory">config_directory</a> (see 'postconf -d' output)</b>
The default location of the Postfix <a href="postconf.5.html">main.cf</a> and
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/html/master.8.html new/postfix-2.5.3/html/master.8.html
--- old/postfix-2.5.1/html/master.8.html 2007-07-13 22:16:55.000000000 +0200
+++ new/postfix-2.5.3/html/master.8.html 2008-05-09 02:12:00.000000000 +0200
@@ -171,6 +171,7 @@
/etc/postfix/<a href="postconf.5.html">main.cf</a>, global configuration file.
/etc/postfix/<a href="master.5.html">master.cf</a>, master server configuration file.
/var/spool/postfix/pid/master.pid, master lock file.
+ /var/lib/postfix/master.lock, master lock file.
<b>SEE ALSO</b>
<a href="qmgr.8.html">qmgr(8)</a>, queue manager
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/html/postconf.5.html new/postfix-2.5.3/html/postconf.5.html
--- old/postfix-2.5.1/html/postconf.5.html 2008-02-14 01:41:27.000000000 +0100
+++ new/postfix-2.5.3/html/postconf.5.html 2008-07-27 21:47:10.000000000 +0200
@@ -12497,6 +12497,17 @@
</DD>
+<DT><b><a name="strict_mailbox_ownership">strict_mailbox_ownership</a>
+(default: yes)</b></DT><DD>
+
+<p> Defer delivery when a mailbox file is not owned by its recipient.
+The default setting is not backwards compatible. </p>
+
+<p> This feature is available in Postfix 2.5.3 and later. </p>
+
+
+</DD>
+
<DT><b><a name="strict_mime_encoding_domain">strict_mime_encoding_domain</a>
(default: no)</b></DT><DD>
@@ -13211,7 +13222,7 @@
(default: 450)</b></DT><DD>
<p>
-The numerical Postfix SMTP server response code when a recipient
+The numerical Postfix SMTP server response code when a sender
address is rejected by the <a href="postconf.5.html#reject_unverified_sender">reject_unverified_sender</a> restriction.
</p>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/html/smtpd.8.html new/postfix-2.5.3/html/smtpd.8.html
--- old/postfix-2.5.1/html/smtpd.8.html 2008-02-11 01:49:26.000000000 +0100
+++ new/postfix-2.5.3/html/smtpd.8.html 2008-07-27 20:01:01.000000000 +0200
@@ -956,7 +956,7 @@
<b><a href="postconf.5.html#unverified_sender_reject_code">unverified_sender_reject_code</a> (450)</b>
The numerical Postfix SMTP server response code
- when a recipient address is rejected by the
+ when a sender address is rejected by the
<a href="postconf.5.html#reject_unverified_sender">reject_unverified_sender</a> restriction.
<b><a href="postconf.5.html#unverified_recipient_reject_code">unverified_recipient_reject_code</a> (450)</b>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/html/virtual.8.html new/postfix-2.5.3/html/virtual.8.html
--- old/postfix-2.5.1/html/virtual.8.html 2008-01-08 23:22:44.000000000 +0100
+++ new/postfix-2.5.3/html/virtual.8.html 2008-07-27 22:33:17.000000000 +0200
@@ -200,9 +200,15 @@
destination for final delivery to domains listed
with $<a href="postconf.5.html#virtual_mailbox_domains">virtual_mailbox_domains</a>.
+ Available in Postfix version 2.5.3 and later:
+
+ <b><a href="postconf.5.html#strict_mailbox_ownership">strict_mailbox_ownership</a> (yes)</b>
+ Defer delivery when a mailbox file is not owned by
+ its recipient.
+
<b>LOCKING CONTROLS</b>
<b><a href="postconf.5.html#virtual_mailbox_lock">virtual_mailbox_lock</a> (see 'postconf -d' output)</b>
- How to lock a UNIX-style <a href="virtual.8.html"><b>virtual</b>(8)</a> mailbox before
+ How to lock a UNIX-style <a href="virtual.8.html"><b>virtual</b>(8)</a> mailbox before
attempting delivery.
<b><a href="postconf.5.html#deliver_lock_attempts">deliver_lock_attempts</a> (20)</b>
@@ -210,41 +216,41 @@
sive lock on a mailbox file or <a href="bounce.8.html"><b>bounce</b>(8)</a> logfile.
<b><a href="postconf.5.html#deliver_lock_delay">deliver_lock_delay</a> (1s)</b>
- The time between attempts to acquire an exclusive
+ The time between attempts to acquire an exclusive
lock on a mailbox file or <a href="bounce.8.html"><b>bounce</b>(8)</a> logfile.
<b><a href="postconf.5.html#stale_lock_time">stale_lock_time</a> (500s)</b>
- The time after which a stale exclusive mailbox
+ The time after which a stale exclusive mailbox
lockfile is removed.
<b>RESOURCE AND RATE CONTROLS</b>
<b><a href="postconf.5.html#virtual_destination_concurrency_limit">virtual_destination_concurrency_limit</a> ($<a href="postconf.5.html#default_destination_concurrency_limit">default_destina</a>-</b>
<b><a href="postconf.5.html#default_destination_concurrency_limit">tion_concurrency_limit</a>)</b>
- The maximal number of parallel deliveries to the
- same destination via the virtual message delivery
+ The maximal number of parallel deliveries to the
+ same destination via the virtual message delivery
transport.
<b><a href="postconf.5.html#virtual_destination_recipient_limit">virtual_destination_recipient_limit</a> ($<a href="postconf.5.html#default_destination_recipient_limit">default_destina</a>-</b>
<b><a href="postconf.5.html#default_destination_recipient_limit">tion_recipient_limit</a>)</b>
- The maximal number of recipients per delivery via
+ The maximal number of recipients per delivery via
the virtual message delivery transport.
<b><a href="postconf.5.html#virtual_mailbox_limit">virtual_mailbox_limit</a> (51200000)</b>
- The maximal size in bytes of an individual mailbox
+ The maximal size in bytes of an individual mailbox
or maildir file, or zero (no limit).
<b>MISCELLANEOUS CONTROLS</b>
<b><a href="postconf.5.html#config_directory">config_directory</a> (see 'postconf -d' output)</b>
- The default location of the Postfix <a href="postconf.5.html">main.cf</a> and
+ The default location of the Postfix <a href="postconf.5.html">main.cf</a> and
<a href="master.5.html">master.cf</a> configuration files.
<b><a href="postconf.5.html#daemon_timeout">daemon_timeout</a> (18000s)</b>
- How much time a Postfix daemon process may take to
- handle a request before it is terminated by a
+ How much time a Postfix daemon process may take to
+ handle a request before it is terminated by a
built-in watchdog timer.
<b><a href="postconf.5.html#delay_logging_resolution_limit">delay_logging_resolution_limit</a> (2)</b>
- The maximal number of digits after the decimal
+ The maximal number of digits after the decimal
point when logging sub-second delay values.
<b><a href="postconf.5.html#ipc_timeout">ipc_timeout</a> (3600s)</b>
@@ -252,33 +258,33 @@
over an internal communication channel.
<b><a href="postconf.5.html#max_idle">max_idle</a> (100s)</b>
- The maximum amount of time that an idle Postfix
- daemon process waits for an incoming connection
+ The maximum amount of time that an idle Postfix
+ daemon process waits for an incoming connection
before terminating voluntarily.
<b><a href="postconf.5.html#max_use">max_use</a> (100)</b>
- The maximal number of incoming connections that a
- Postfix daemon process will service before termi-
+ The maximal number of incoming connections that a
+ Postfix daemon process will service before termi-
nating voluntarily.
<b><a href="postconf.5.html#process_id">process_id</a> (read-only)</b>
- The process ID of a Postfix command or daemon
+ The process ID of a Postfix command or daemon
process.
<b><a href="postconf.5.html#process_name">process_name</a> (read-only)</b>
- The process name of a Postfix command or daemon
+ The process name of a Postfix command or daemon
process.
<b><a href="postconf.5.html#queue_directory">queue_directory</a> (see 'postconf -d' output)</b>
- The location of the Postfix top-level queue direc-
+ The location of the Postfix top-level queue direc-
tory.
<b><a href="postconf.5.html#syslog_facility">syslog_facility</a> (mail)</b>
The syslog facility of Postfix logging.
<b><a href="postconf.5.html#syslog_name">syslog_name</a> (postfix)</b>
- The mail system name that is prepended to the
- process name in syslog records, so that "smtpd"
+ The mail system name that is prepended to the
+ process name in syslog records, so that "smtpd"
becomes, for example, "postfix/smtpd".
<b>SEE ALSO</b>
@@ -291,20 +297,20 @@
<a href="VIRTUAL_README.html">VIRTUAL_README</a>, domain hosting howto
<b>LICENSE</b>
- The Secure Mailer license must be distributed with this
+ The Secure Mailer license must be distributed with this
software.
<b>HISTORY</b>
- This delivery agent was originally based on the Postfix
- local delivery agent. Modifications mainly consisted of
- removing code that either was not applicable or that was
- not safe in this context: aliases, ~user/.forward files,
+ This delivery agent was originally based on the Postfix
+ local delivery agent. Modifications mainly consisted of
+ removing code that either was not applicable or that was
+ not safe in this context: aliases, ~user/.forward files,
delivery to "|command" or to /file/name.
The <b>Delivered-To:</b> message header appears in the <b>qmail</b> sys-
tem by Daniel Bernstein.
- The <b>maildir</b> structure appears in the <b>qmail</b> system by
+ The <b>maildir</b> structure appears in the <b>qmail</b> system by
Daniel Bernstein.
<b>AUTHOR(S)</b>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/man/man5/postconf.5 new/postfix-2.5.3/man/man5/postconf.5
--- old/postfix-2.5.1/man/man5/postconf.5 2008-02-14 01:41:28.000000000 +0100
+++ new/postfix-2.5.3/man/man5/postconf.5 2008-07-27 21:47:10.000000000 +0200
@@ -7771,6 +7771,11 @@
because it is likely to reject legitimate email.
.PP
This feature is available in Postfix 2.0 and later.
+.SH strict_mailbox_ownership (default: yes)
+Defer delivery when a mailbox file is not owned by its recipient.
+The default setting is not backwards compatible.
+.PP
+This feature is available in Postfix 2.5.3 and later.
.SH strict_mime_encoding_domain (default: no)
Reject mail with invalid Content-Transfer-Encoding: information
for the message/* or multipart/* MIME content types. This blocks
@@ -8132,7 +8137,7 @@
.PP
This feature is available in Postfix 2.1 and later.
.SH unverified_sender_reject_code (default: 450)
-The numerical Postfix SMTP server response code when a recipient
+The numerical Postfix SMTP server response code when a sender
address is rejected by the reject_unverified_sender restriction.
.PP
Unlike elsewhere in Postfix, you can specify 250 in order to
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/man/man8/local.8 new/postfix-2.5.3/man/man8/local.8
--- old/postfix-2.5.1/man/man8/local.8 2008-01-08 23:22:40.000000000 +0100
+++ new/postfix-2.5.3/man/man8/local.8 2008-07-27 22:30:38.000000000 +0200
@@ -415,6 +415,10 @@
address (see prepend_delivered_header) only once, at the start of
a delivery attempt; do not update the Delivered-To: address while
expanding aliases or .forward files.
+.PP
+Available in Postfix version 2.5.3 and later:
+.IP "\fBstrict_mailbox_ownership (yes)\fR"
+Defer delivery when a mailbox file is not owned by its recipient.
.SH "DELIVERY METHOD CONTROLS"
.na
.nf
@@ -513,7 +517,7 @@
Restrict \fBlocal\fR(8) mail delivery to external files.
.IP "\fBcommand_expansion_filter (see 'postconf -d' output)\fR"
Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
-$name expansions of $mailbox_command.
+$name expansions of $mailbox_command and $command_execution_directory.
.IP "\fBdefault_privs (nobody)\fR"
The default rights used by the \fBlocal\fR(8) delivery agent for delivery
to external file or command.
@@ -525,6 +529,10 @@
.IP "\fBexecution_directory_expansion_filter (see 'postconf -d' output)\fR"
Restrict the characters that the \fBlocal\fR(8) delivery agent allows
in $name expansions of $command_execution_directory.
+.PP
+Available in Postfix version 2.5.3 and later:
+.IP "\fBstrict_mailbox_ownership (yes)\fR"
+Defer delivery when a mailbox file is not owned by its recipient.
.SH "MISCELLANEOUS CONTROLS"
.na
.nf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/man/man8/master.8 new/postfix-2.5.3/man/man8/master.8
--- old/postfix-2.5.1/man/man8/master.8 2007-03-17 18:59:49.000000000 +0100
+++ new/postfix-2.5.3/man/man8/master.8 2008-05-09 02:11:59.000000000 +0200
@@ -151,6 +151,7 @@
/etc/postfix/main.cf, global configuration file.
/etc/postfix/master.cf, master server configuration file.
/var/spool/postfix/pid/master.pid, master lock file.
+/var/lib/postfix/master.lock, master lock file.
.SH "SEE ALSO"
.na
.nf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/man/man8/smtpd.8 new/postfix-2.5.3/man/man8/smtpd.8
--- old/postfix-2.5.1/man/man8/smtpd.8 2008-02-11 01:49:21.000000000 +0100
+++ new/postfix-2.5.3/man/man8/smtpd.8 2008-07-27 20:00:58.000000000 +0200
@@ -769,7 +769,7 @@
The sender address to use in address verification probes; prior
to Postfix 2.5 the default was "postmaster".
.IP "\fBunverified_sender_reject_code (450)\fR"
-The numerical Postfix SMTP server response code when a recipient
+The numerical Postfix SMTP server response code when a sender
address is rejected by the reject_unverified_sender restriction.
.IP "\fBunverified_recipient_reject_code (450)\fR"
The numerical Postfix SMTP server response when a recipient address
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/man/man8/virtual.8 new/postfix-2.5.3/man/man8/virtual.8
--- old/postfix-2.5.1/man/man8/virtual.8 2008-01-08 23:22:41.000000000 +0100
+++ new/postfix-2.5.3/man/man8/virtual.8 2008-07-27 22:33:17.000000000 +0200
@@ -213,6 +213,10 @@
.IP "\fBvirtual_transport (virtual)\fR"
The default mail delivery transport and next-hop destination for
final delivery to domains listed with $virtual_mailbox_domains.
+.PP
+Available in Postfix version 2.5.3 and later:
+.IP "\fBstrict_mailbox_ownership (yes)\fR"
+Defer delivery when a mailbox file is not owned by its recipient.
.SH "LOCKING CONTROLS"
.na
.nf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/mantools/postlink new/postfix-2.5.3/mantools/postlink
--- old/postfix-2.5.1/mantools/postlink 2008-01-24 02:38:00.000000000 +0100
+++ new/postfix-2.5.3/mantools/postlink 2008-07-27 21:34:16.000000000 +0200
@@ -517,6 +517,7 @@
s;\bstrict_8bitmime\b;<a href="postconf.5.html#strict_8bitmime">$&</a>;g;
s;\bstrict_8bitmime_body\b;<a href="postconf.5.html#strict_8bitmime_body">$&</a>;g;
s;\bstrict_mime_encoding_domain\b;<a href="postconf.5.html#strict_mime_encoding_domain">$&</a>;g;
+ s;\bstrict_mailbox_ownership\b;<a href="postconf.5.html#strict_mailbox_ownership">$&</a>;g;
s;\bstrict_rfc821_envelopes\b;<a href="postconf.5.html#strict_rfc821_envelopes">$&</a>;g;
s;\bsun_mailtool_compatibility\b;<a href="postconf.5.html#sun_mailtool_compatibility">$&</a>;g;
s;\bswap_bangpath\b;<a href="postconf.5.html#swap_bangpath">$&</a>;g;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/proto/ADDRESS_VERIFICATION_README.html new/postfix-2.5.3/proto/ADDRESS_VERIFICATION_README.html
--- old/postfix-2.5.1/proto/ADDRESS_VERIFICATION_README.html 2008-01-29 23:18:00.000000000 +0100
+++ new/postfix-2.5.3/proto/ADDRESS_VERIFICATION_README.html 2008-05-03 02:28:20.000000000 +0200
@@ -207,9 +207,10 @@
transferred. Postfix address verification does not work with such
sites. </p>
-<li> <p> By default, Postfix probe messages have "postmaster@$myorigin"
-as the sender address. This is SAFE because the Postfix SMTP server
-does not reject mail for this address. </p>
+<li> <p> By default, Postfix probe messages have "double-bounce@$myorigin"
+as the sender address (with Postfix versions before 2.5, the default
+is "postmaster@$myorigin"). This is SAFE because the Postfix SMTP
+server does not reject mail for this address. </p>
<p> You can change this into the null address ("address_verify_sender
="). This is UNSAFE because address probes will fail with
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/proto/postconf.proto new/postfix-2.5.3/proto/postconf.proto
--- old/postfix-2.5.1/proto/postconf.proto 2008-02-14 01:40:29.000000000 +0100
+++ new/postfix-2.5.3/proto/postconf.proto 2008-07-27 21:35:55.000000000 +0200
@@ -6165,7 +6165,7 @@
%PARAM unverified_sender_reject_code 450
<p>
-The numerical Postfix SMTP server response code when a recipient
+The numerical Postfix SMTP server response code when a sender
address is rejected by the reject_unverified_sender restriction.
</p>
@@ -11517,3 +11517,9 @@
<p> This feature is available in Postfix 2.5 and later. </p>
+%PARAM strict_mailbox_ownership yes
+
+<p> Defer delivery when a mailbox file is not owned by its recipient.
+The default setting is not backwards compatible. </p>
+
+<p> This feature is available in Postfix 2.5.3 and later. </p>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/README_FILES/ADDRESS_VERIFICATION_README new/postfix-2.5.3/README_FILES/ADDRESS_VERIFICATION_README
--- old/postfix-2.5.1/README_FILES/ADDRESS_VERIFICATION_README 2008-02-14 01:41:27.000000000 +0100
+++ new/postfix-2.5.3/README_FILES/ADDRESS_VERIFICATION_README 2008-05-09 02:11:59.000000000 +0200
@@ -103,9 +103,10 @@
response to end of DATA after a message is transferred. Postfix address
verification does not work with such sites.
- * By default, Postfix probe messages have "postmaster@$myorigin" as the
- sender address. This is SAFE because the Postfix SMTP server does not
- reject mail for this address.
+ * By default, Postfix probe messages have "double-bounce@$myorigin" as the
+ sender address (with Postfix versions before 2.5, the default is
+ "postmaster@$myorigin"). This is SAFE because the Postfix SMTP server does
+ not reject mail for this address.
You can change this into the null address ("address_verify_sender ="). This
is UNSAFE because address probes will fail with mis-configured sites that
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/RELEASE_NOTES new/postfix-2.5.3/RELEASE_NOTES
--- old/postfix-2.5.1/RELEASE_NOTES 2008-01-24 02:10:19.000000000 +0100
+++ new/postfix-2.5.3/RELEASE_NOTES 2008-07-27 22:27:56.000000000 +0200
@@ -11,8 +11,16 @@
The mail_release_date configuration parameter (format: yyyymmdd)
specifies the release date of a stable release or snapshot release.
-Incompatibility with Postfix 2.3 and earlier
---------------------------------------------
+Incompatibility with Postfix 2.5.3
+==================================
+
+When a mailbox file is not owned by its recipient, the local and
+virtual delivery agents now log a warning and defer delivery.
+Specify "strict_mailbox_ownership = no" to ignore such ownership
+discrepancies.
+
+Postfix 2.5.0 Release Notes
+===========================
If you upgrade from Postfix 2.3 or earlier, read RELEASE_NOTES-2.4
before proceeding.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/bounce/bounce_template.c new/postfix-2.5.3/src/bounce/bounce_template.c
--- old/postfix-2.5.1/src/bounce/bounce_template.c 2008-01-08 22:03:33.000000000 +0100
+++ new/postfix-2.5.3/src/bounce/bounce_template.c 2008-02-28 21:52:27.000000000 +0100
@@ -343,7 +343,7 @@
* Is this 7bit or 8bit text? If the character set is US-ASCII, then
* don't allow 8bit text. Don't assume 8bit when charset was changed.
*/
-#define NON_ASCII(p) (*(p) && !allascii((p)))
+#define NON_ASCII(p) ((p) && *(p) && !allascii((p)))
if (NON_ASCII(cp) || NON_ASCII(tval)) {
if (strcasecmp(tp->mime_charset, "us-ascii") == 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/global/cleanup_strflags.c new/postfix-2.5.3/src/global/cleanup_strflags.c
--- old/postfix-2.5.1/src/global/cleanup_strflags.c 2006-06-13 23:36:58.000000000 +0200
+++ new/postfix-2.5.3/src/global/cleanup_strflags.c 2008-03-12 01:12:23.000000000 +0100
@@ -52,6 +52,7 @@
CLEANUP_FLAG_BCC_OK, "enable_automatic_bcc",
CLEANUP_FLAG_MAP_OK, "enable_address_mapping",
CLEANUP_FLAG_MILTER, "enable_milters",
+ CLEANUP_FLAG_SMTP_REPLY, "enable_smtp_reply",
};
/* cleanup_strflags - map flags code to printable string */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/global/mail_params.h new/postfix-2.5.3/src/global/mail_params.h
--- old/postfix-2.5.1/src/global/mail_params.h 2008-01-24 02:10:19.000000000 +0100
+++ new/postfix-2.5.3/src/global/mail_params.h 2008-07-27 21:10:27.000000000 +0200
@@ -2057,7 +2057,11 @@
" $" VAR_RCPT_CANON_MAPS \
" $" VAR_RELOCATED_MAPS \
" $" VAR_TRANSPORT_MAPS \
- " $" VAR_MYNETWORKS
+ " $" VAR_MYNETWORKS \
+ " $" VAR_SEND_BCC_MAPS \
+ " $" VAR_RCPT_BCC_MAPS \
+ " $" VAR_SMTP_GENERIC_MAPS \
+ " $" VAR_LMTP_GENERIC_MAPS
extern char *var_proxy_read_maps;
#define VAR_PROXY_WRITE_MAPS "proxy_write_maps"
@@ -2928,6 +2932,13 @@
#define DEF_STRESS ""
extern char *var_stress;
+ /*
+ * Mailbox ownership.
+ */
+#define VAR_STRICT_MBOX_OWNER "strict_mailbox_ownership"
+#define DEF_STRICT_MBOX_OWNER 1
+extern bool var_strict_mbox_owner;
+
/* LICENSE
/* .ad
/* .fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/global/mail_version.h new/postfix-2.5.3/src/global/mail_version.h
--- old/postfix-2.5.1/src/global/mail_version.h 2008-02-17 02:44:19.000000000 +0100
+++ new/postfix-2.5.3/src/global/mail_version.h 2008-07-26 03:47:08.000000000 +0200
@@ -20,8 +20,8 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20080216"
-#define MAIL_VERSION_NUMBER "2.5.1"
+#define MAIL_RELEASE_DATE "20080726"
+#define MAIL_VERSION_NUMBER "2.5.3"
#ifdef SNAPSHOT
# define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/local/local.c new/postfix-2.5.3/src/local/local.c
--- old/postfix-2.5.1/src/local/local.c 2008-01-08 21:36:13.000000000 +0100
+++ new/postfix-2.5.3/src/local/local.c 2008-07-27 22:01:33.000000000 +0200
@@ -381,6 +381,10 @@
/* address (see prepend_delivered_header) only once, at the start of
/* a delivery attempt; do not update the Delivered-To: address while
/* expanding aliases or .forward files.
+/* .PP
+/* Available in Postfix version 2.5.3 and later:
+/* .IP "\fBstrict_mailbox_ownership (yes)\fR"
+/* Defer delivery when a mailbox file is not owned by its recipient.
/* DELIVERY METHOD CONTROLS
/* .ad
/* .fi
@@ -471,7 +475,7 @@
/* Restrict \fBlocal\fR(8) mail delivery to external files.
/* .IP "\fBcommand_expansion_filter (see 'postconf -d' output)\fR"
/* Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
-/* $name expansions of $mailbox_command.
+/* $name expansions of $mailbox_command and $command_execution_directory.
/* .IP "\fBdefault_privs (nobody)\fR"
/* The default rights used by the \fBlocal\fR(8) delivery agent for delivery
/* to external file or command.
@@ -483,6 +487,10 @@
/* .IP "\fBexecution_directory_expansion_filter (see 'postconf -d' output)\fR"
/* Restrict the characters that the \fBlocal\fR(8) delivery agent allows
/* in $name expansions of $command_execution_directory.
+/* .PP
+/* Available in Postfix version 2.5.3 and later:
+/* .IP "\fBstrict_mailbox_ownership (yes)\fR"
+/* Defer delivery when a mailbox file is not owned by its recipient.
/* MISCELLANEOUS CONTROLS
/* .ad
/* .fi
@@ -644,6 +652,7 @@
char *var_mailbox_lock;
int var_mailbox_limit;
bool var_frozen_delivered;
+bool var_strict_mbox_owner;
int local_cmd_deliver_mask;
int local_file_deliver_mask;
@@ -891,6 +900,7 @@
VAR_STAT_HOME_DIR, DEF_STAT_HOME_DIR, &var_stat_home_dir,
VAR_MAILTOOL_COMPAT, DEF_MAILTOOL_COMPAT, &var_mailtool_compat,
VAR_FROZEN_DELIVERED, DEF_FROZEN_DELIVERED, &var_frozen_delivered,
+ VAR_STRICT_MBOX_OWNER, DEF_STRICT_MBOX_OWNER, &var_strict_mbox_owner,
0,
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/local/mailbox.c new/postfix-2.5.3/src/local/mailbox.c
--- old/postfix-2.5.1/src/local/mailbox.c 2007-05-15 22:14:21.000000000 +0200
+++ new/postfix-2.5.3/src/local/mailbox.c 2008-07-26 03:21:22.000000000 +0200
@@ -194,6 +194,12 @@
vstream_fclose(mp->fp);
dsb_simple(why, "5.2.0",
"destination %s is not a regular file", mailbox);
+ } else if (var_strict_mbox_owner && st.st_uid != usr_attr.uid) {
+ vstream_fclose(mp->fp);
+ dsb_simple(why, "4.2.0",
+ "destination %s is not owned by recipient", mailbox);
+ msg_warn("specify \"%s = no\" to ignore mailbox ownership mismatch",
+ VAR_STRICT_MBOX_OWNER);
} else {
end = vstream_fseek(mp->fp, (off_t) 0, SEEK_END);
mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr), mp->fp,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/master/master.c new/postfix-2.5.3/src/master/master.c
--- old/postfix-2.5.1/src/master/master.c 2007-03-17 18:59:38.000000000 +0100
+++ new/postfix-2.5.3/src/master/master.c 2008-04-29 23:03:46.000000000 +0200
@@ -133,6 +133,7 @@
/* /etc/postfix/main.cf, global configuration file.
/* /etc/postfix/master.cf, master server configuration file.
/* /var/spool/postfix/pid/master.pid, master lock file.
+/* /var/lib/postfix/master.lock, master lock file.
/* SEE ALSO
/* qmgr(8), queue manager
/* verify(8), address verification
@@ -177,6 +178,8 @@
#include <clean_env.h>
#include <argv.h>
#include <safe.h>
+#include <set_eugid.h>
+#include <set_ugid.h>
/* Global library. */
@@ -216,7 +219,9 @@
int main(int argc, char **argv)
{
static VSTREAM *lock_fp;
+ static VSTREAM *data_lock_fp;
VSTRING *lock_path;
+ VSTRING *data_lock_path;
off_t inherited_limit;
int debug_me = 0;
int ch;
@@ -390,6 +395,7 @@
* isn't locked.
*/
lock_path = vstring_alloc(10);
+ data_lock_path = vstring_alloc(10);
why = vstring_alloc(10);
vstring_sprintf(lock_path, "%s/%s.pid", DEF_PID_DIR, var_procname);
@@ -407,8 +413,29 @@
msg_fatal("cannot update lock file %s: %m", vstring_str(lock_path));
close_on_exec(vstream_fileno(lock_fp), CLOSE_ON_EXEC);
+ /*
+ * Lock down the Postfix-writable data directory.
+ */
+ vstring_sprintf(data_lock_path, "%s/%s.lock", var_data_dir, var_procname);
+ set_eugid(var_owner_uid, var_owner_gid);
+ data_lock_fp =
+ open_lock(vstring_str(data_lock_path), O_RDWR | O_CREAT, 0644, why);
+ set_ugid(getuid(), getgid());
+ if (data_lock_fp == 0)
+ msg_fatal("open lock file %s: %s",
+ vstring_str(data_lock_path), vstring_str(why));
+ vstream_fprintf(data_lock_fp, "%*lu\n", (int) sizeof(unsigned long) * 4,
+ (unsigned long) var_pid);
+ if (vstream_fflush(data_lock_fp))
+ msg_fatal("cannot update lock file %s: %m", vstring_str(data_lock_path));
+ close_on_exec(vstream_fileno(data_lock_fp), CLOSE_ON_EXEC);
+
+ /*
+ * Clean up.
+ */
vstring_free(why);
vstring_free(lock_path);
+ vstring_free(data_lock_path);
/*
* Optionally start the debugger on ourself.
@@ -440,6 +467,9 @@
if (myflock(vstream_fileno(lock_fp), INTERNAL_LOCK,
MYFLOCK_OP_EXCLUSIVE) < 0)
msg_fatal("refresh exclusive lock: %m");
+ if (myflock(vstream_fileno(data_lock_fp), INTERNAL_LOCK,
+ MYFLOCK_OP_EXCLUSIVE) < 0)
+ msg_fatal("refresh exclusive lock: %m");
#endif
watchdog_start(watchdog); /* same as trigger servers */
event_loop(-1);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/oqmgr/qmgr_message.c new/postfix-2.5.3/src/oqmgr/qmgr_message.c
--- old/postfix-2.5.1/src/oqmgr/qmgr_message.c 2007-12-12 23:30:42.000000000 +0100
+++ new/postfix-2.5.3/src/oqmgr/qmgr_message.c 2008-04-11 23:36:04.000000000 +0200
@@ -311,6 +311,7 @@
int dsn_notify = 0;
char *dsn_orcpt = 0;
int n;
+ int have_log_client_attr = 0;
/*
* Initialize. No early returns or we have a memory leak.
@@ -612,18 +613,24 @@
* client information. To support old queue files, we accept both
* names for the purpose of logging; the new name overrides the
* old one.
+ *
+ * XXX Do not use the "legacy" client_name etc. attribute values for
+ * initializing the logging attributes, when this file already
+ * contains the "modern" log_client_name etc. logging attributes.
+ * Otherwise, logging attributes that are not present in the
+ * queue file would be set with information from the real client.
*/
else if (strcmp(name, MAIL_ATTR_ACT_CLIENT_NAME) == 0) {
- if (message->client_name == 0)
+ if (have_log_client_attr == 0 && message->client_name == 0)
message->client_name = mystrdup(value);
} else if (strcmp(name, MAIL_ATTR_ACT_CLIENT_ADDR) == 0) {
- if (message->client_addr == 0)
+ if (have_log_client_attr == 0 && message->client_addr == 0)
message->client_addr = mystrdup(value);
} else if (strcmp(name, MAIL_ATTR_ACT_PROTO_NAME) == 0) {
- if (message->client_proto == 0)
+ if (have_log_client_attr == 0 && message->client_proto == 0)
message->client_proto = mystrdup(value);
} else if (strcmp(name, MAIL_ATTR_ACT_HELO_NAME) == 0) {
- if (message->client_helo == 0)
+ if (have_log_client_attr == 0 && message->client_helo == 0)
message->client_helo = mystrdup(value);
}
/* Original client attributes. */
@@ -631,22 +638,27 @@
if (message->client_name != 0)
myfree(message->client_name);
message->client_name = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_LOG_CLIENT_ADDR) == 0) {
if (message->client_addr != 0)
myfree(message->client_addr);
message->client_addr = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_LOG_CLIENT_PORT) == 0) {
if (message->client_port != 0)
myfree(message->client_port);
message->client_port = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_LOG_PROTO_NAME) == 0) {
if (message->client_proto != 0)
myfree(message->client_proto);
message->client_proto = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_LOG_HELO_NAME) == 0) {
if (message->client_helo != 0)
myfree(message->client_helo);
message->client_helo = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_SASL_METHOD) == 0) {
if (message->sasl_method == 0)
message->sasl_method = mystrdup(value);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/qmgr/qmgr_message.c new/postfix-2.5.3/src/qmgr/qmgr_message.c
--- old/postfix-2.5.1/src/qmgr/qmgr_message.c 2007-12-12 23:29:47.000000000 +0100
+++ new/postfix-2.5.3/src/qmgr/qmgr_message.c 2008-04-11 23:35:10.000000000 +0200
@@ -334,6 +334,7 @@
int dsn_notify = 0;
char *dsn_orcpt = 0;
int n;
+ int have_log_client_attr = 0;
/*
* Initialize. No early returns or we have a memory leak.
@@ -653,18 +654,24 @@
* client information. To support old queue files we accept both
* names for the purpose of logging; the new name overrides the
* old one.
+ *
+ * XXX Do not use the "legacy" client_name etc. attribute values for
+ * initializing the logging attributes, when this file already
+ * contains the "modern" log_client_name etc. logging attributes.
+ * Otherwise, logging attributes that are not present in the
+ * queue file would be set with information from the real client.
*/
else if (strcmp(name, MAIL_ATTR_ACT_CLIENT_NAME) == 0) {
- if (message->client_name == 0)
+ if (have_log_client_attr == 0 && message->client_name == 0)
message->client_name = mystrdup(value);
} else if (strcmp(name, MAIL_ATTR_ACT_CLIENT_ADDR) == 0) {
- if (message->client_addr == 0)
+ if (have_log_client_attr == 0 && message->client_addr == 0)
message->client_addr = mystrdup(value);
} else if (strcmp(name, MAIL_ATTR_ACT_PROTO_NAME) == 0) {
- if (message->client_proto == 0)
+ if (have_log_client_attr == 0 && message->client_proto == 0)
message->client_proto = mystrdup(value);
} else if (strcmp(name, MAIL_ATTR_ACT_HELO_NAME) == 0) {
- if (message->client_helo == 0)
+ if (have_log_client_attr == 0 && message->client_helo == 0)
message->client_helo = mystrdup(value);
}
/* Original client attributes. */
@@ -672,22 +679,27 @@
if (message->client_name != 0)
myfree(message->client_name);
message->client_name = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_LOG_CLIENT_ADDR) == 0) {
if (message->client_addr != 0)
myfree(message->client_addr);
message->client_addr = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_LOG_CLIENT_PORT) == 0) {
if (message->client_port != 0)
myfree(message->client_port);
message->client_port = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_LOG_PROTO_NAME) == 0) {
if (message->client_proto != 0)
myfree(message->client_proto);
message->client_proto = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_LOG_HELO_NAME) == 0) {
if (message->client_helo != 0)
myfree(message->client_helo);
message->client_helo = mystrdup(value);
+ have_log_client_attr = 1;
} else if (strcmp(name, MAIL_ATTR_SASL_METHOD) == 0) {
if (message->sasl_method == 0)
message->sasl_method = mystrdup(value);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/smtp/smtp_sasl_glue.c new/postfix-2.5.3/src/smtp/smtp_sasl_glue.c
--- old/postfix-2.5.1/src/smtp/smtp_sasl_glue.c 2008-01-15 02:09:35.000000000 +0100
+++ new/postfix-2.5.3/src/smtp/smtp_sasl_glue.c 2008-02-17 01:12:29.000000000 +0100
@@ -291,6 +291,7 @@
const char *mechanism;
int result;
char *line;
+ int steps = 0;
/*
* Sanity check.
@@ -357,6 +358,16 @@
while ((resp = smtp_chat_resp(session))->code / 100 == 3) {
/*
+ * Sanity check.
+ */
+ if (++steps > 100) {
+ dsb_simple(why, "4.3.0", "SASL authentication failed; "
+ "authentication protocol loop with server %s",
+ session->namaddr);
+ return (-1);
+ }
+
+ /*
* Process a server challenge.
*/
line = resp->str;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/smtpd/smtpd.c new/postfix-2.5.3/src/smtpd/smtpd.c
--- old/postfix-2.5.1/src/smtpd/smtpd.c 2008-02-07 22:20:33.000000000 +0100
+++ new/postfix-2.5.3/src/smtpd/smtpd.c 2008-06-20 13:59:45.000000000 +0200
@@ -719,7 +719,7 @@
/* The sender address to use in address verification probes; prior
/* to Postfix 2.5 the default was "postmaster".
/* .IP "\fBunverified_sender_reject_code (450)\fR"
-/* The numerical Postfix SMTP server response code when a recipient
+/* The numerical Postfix SMTP server response code when a sender
/* address is rejected by the reject_unverified_sender restriction.
/* .IP "\fBunverified_recipient_reject_code (450)\fR"
/* The numerical Postfix SMTP server response when a recipient address
@@ -2108,14 +2108,14 @@
if (smtpd_milters != 0
&& SMTPD_STAND_ALONE(state) == 0
&& (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
+ PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
err = milter_mail_event(smtpd_milters,
milter_argv(state, argc - 2, argv + 2));
if (err != 0) {
/* Log reject etc. with correct sender information. */
- PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
err = check_milter_reply(state, err);
- POP_STRING(saved_sender, state->sender);
}
+ POP_STRING(saved_sender, state->sender);
if (err != 0) {
/* XXX Reset access map side effects. */
mail_reset(state);
@@ -2362,14 +2362,14 @@
}
if (smtpd_milters != 0
&& (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
+ PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
err = milter_rcpt_event(smtpd_milters,
milter_argv(state, argc - 2, argv + 2));
if (err != 0) {
/* Log reject etc. with correct recipient information. */
- PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
err = check_milter_reply(state, err);
- POP_STRING(saved_rcpt, state->recipient);
}
+ POP_STRING(saved_rcpt, state->recipient);
if (err != 0) {
smtpd_chat_reply(state, "%s", err);
return (-1);
@@ -2506,6 +2506,7 @@
}
while (pc-- > 0)
VSTRING_ADDCH(comment_string, ')');
+ VSTRING_TERMINATE(comment_string);
}
/* data_cmd - process DATA command */
@@ -2687,7 +2688,7 @@
if (state->rcpt_count == 1 && state->recipient) {
out_fprintf(out_stream, REC_TYPE_NORM,
state->cleanup ? "\tby %s (%s) with %s%s%s id %s" :
- "\tby %s (%s) with %s",
+ "\tby %s (%s) with %s%s%s",
var_myhostname, var_mail_name,
state->protocol, rfc3848_sess,
rfc3848_auth, state->queue_id);
@@ -2698,7 +2699,7 @@
} else {
out_fprintf(out_stream, REC_TYPE_NORM,
state->cleanup ? "\tby %s (%s) with %s%s%s id %s;" :
- "\tby %s (%s) with %s;",
+ "\tby %s (%s) with %s%s%s;",
var_myhostname, var_mail_name,
state->protocol, rfc3848_sess,
rfc3848_auth, state->queue_id);
@@ -3405,8 +3406,7 @@
if (state->namaddr)
myfree(state->namaddr);
state->namaddr =
- concatenate(state->name, "[", state->addr, "]:",
- state->port, (char *) 0);
+ SMTPD_BUILD_NAMADDRPORT(state->name, state->addr, state->port);
}
/*
@@ -3671,10 +3671,10 @@
myfree(state->xforward.namaddr);
state->xforward.namaddr =
IS_AVAIL_CLIENT_ADDR(state->xforward.addr) ?
- concatenate(state->xforward.name, "[",
- state->xforward.addr, "]:",
- state->xforward.port,
- (char *) 0) : mystrdup(state->xforward.name);
+ SMTPD_BUILD_NAMADDRPORT(state->xforward.name,
+ state->xforward.addr,
+ state->xforward.port) :
+ mystrdup(state->xforward.name);
}
smtpd_chat_reply(state, "250 2.0.0 Ok");
return (0);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/smtpd/smtpd_check.c new/postfix-2.5.3/src/smtpd/smtpd_check.c
--- old/postfix-2.5.1/src/smtpd/smtpd_check.c 2008-01-08 21:59:07.000000000 +0100
+++ new/postfix-2.5.3/src/smtpd/smtpd_check.c 2008-04-11 21:46:54.000000000 +0200
@@ -4295,7 +4295,9 @@
return (0);
if (state->recipient_rcptmap_checked == 1)
return (0);
- state->recipient_rcptmap_checked = 1;
+ if (state->warn_if_reject == 0)
+ /* We really validate the recipient address. */
+ state->recipient_rcptmap_checked = 1;
return (check_rcpt_maps(state, recipient, SMTPD_NAME_RECIPIENT));
}
@@ -4312,7 +4314,9 @@
return (0);
if (state->sender_rcptmap_checked == 1)
return (0);
- state->sender_rcptmap_checked = 1;
+ if (state->warn_if_reject == 0)
+ /* We really validate the sender address. */
+ state->sender_rcptmap_checked = 1;
return (check_rcpt_maps(state, sender, SMTPD_NAME_SENDER));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/smtpd/smtpd.h new/postfix-2.5.3/src/smtpd/smtpd.h
--- old/postfix-2.5.1/src/smtpd/smtpd.h 2008-01-08 02:21:49.000000000 +0100
+++ new/postfix-2.5.3/src/smtpd/smtpd.h 2008-04-30 02:49:01.000000000 +0200
@@ -280,6 +280,14 @@
#define SMTPD_PEER_CODE_FORGED 6
/*
+ * Construct name[addr] or name[addr]:port as appropriate
+ */
+#define SMTPD_BUILD_NAMADDRPORT(name, addr, port) \
+ concatenate((name), "[", (addr), "]", \
+ var_smtpd_client_port_log ? ":" : (char *) 0, \
+ (port), (char *) 0)
+
+ /*
* Choose between normal or forwarded attributes.
*
* Note 1: inside the SMTP server, forwarded attributes must have the exact
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/smtpd/smtpd_peer.c new/postfix-2.5.3/src/smtpd/smtpd_peer.c
--- old/postfix-2.5.1/src/smtpd/smtpd_peer.c 2007-10-07 02:07:08.000000000 +0200
+++ new/postfix-2.5.3/src/smtpd/smtpd_peer.c 2008-04-29 02:06:08.000000000 +0200
@@ -25,7 +25,7 @@
/* The verified client hostname. This name is represented by
/* the string "unknown" when 1) the address->name lookup failed,
/* 2) the name->address mapping fails, or 3) the name->address
-/* does not produce the client IP address.
+/* mapping does not produce the client IP address.
/* .IP reverse_name
/* The unverified client hostname as found with address->name
/* lookup; it is not verified for consistency with the client
@@ -373,10 +373,8 @@
/*
* Do the name[addr]:port formatting for pretty reports.
*/
- state->namaddr =
- concatenate(state->name, "[", state->addr, "]",
- var_smtpd_client_port_log ? ":" : (char *) 0,
- state->port, (char *) 0);
+ state->namaddr = SMTPD_BUILD_NAMADDRPORT(state->name, state->addr,
+ state->port);
}
/* smtpd_peer_reset - destroy peer information */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/util/dict_pcre.c new/postfix-2.5.3/src/util/dict_pcre.c
--- old/postfix-2.5.1/src/util/dict_pcre.c 2007-01-04 15:35:38.000000000 +0100
+++ new/postfix-2.5.3/src/util/dict_pcre.c 2008-04-24 21:52:18.000000000 +0200
@@ -180,7 +180,7 @@
if (ret == PCRE_ERROR_NOSUBSTRING)
return (MAC_PARSE_UNDEF);
else
- msg_fatal("regexp %s, line %d: pcre_get_substring error: %d",
+ msg_fatal("pcre map %s, line %d: pcre_get_substring error: %d",
dict_pcre->dict.name, match_rule->rule.lineno, ret);
}
if (*pp == 0) {
@@ -671,7 +671,7 @@
msg_panic("pcre map %s, line %d: pcre_fullinfo failed",
mapname, lineno);
if (prescan_context.max_sub > actual_sub) {
- msg_warn("regexp map %s, line %d: out of range replacement index \"%d\": "
+ msg_warn("pcre map %s, line %d: out of range replacement index \"%d\": "
"skipping this rule", mapname, lineno,
(int) prescan_context.max_sub);
if (engine.pattern)
@@ -722,9 +722,12 @@
*/
while (*p && ISSPACE(*p))
++p;
- if (*p)
- msg_warn("pcre map %s, line %d: ignoring extra text after IF",
- mapname, lineno);
+ if (*p) {
+ msg_warn("pcre map %s, line %d: ignoring extra text after "
+ "IF statement: \"%s\"", mapname, lineno, p);
+ msg_warn("pcre map %s, line %d: do not prepend whitespace"
+ " to statements between IF and ENDIF", mapname, lineno);
+ }
/*
* Compile the pattern.
@@ -782,7 +785,7 @@
* Unrecognized input.
*/
else {
- msg_warn("regexp map %s, line %d: ignoring unrecognized request",
+ msg_warn("pcre map %s, line %d: ignoring unrecognized request",
mapname, lineno);
return (0);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/util/dict_regexp.c new/postfix-2.5.3/src/util/dict_regexp.c
--- old/postfix-2.5.1/src/util/dict_regexp.c 2007-01-04 15:35:52.000000000 +0100
+++ new/postfix-2.5.3/src/util/dict_regexp.c 2008-03-18 13:17:12.000000000 +0100
@@ -683,9 +683,12 @@
return (0);
while (*p && ISSPACE(*p))
++p;
- if (*p)
- msg_warn("regexp map %s, line %d: ignoring extra text after IF",
- mapname, lineno);
+ if (*p) {
+ msg_warn("regexp map %s, line %d: ignoring extra text after"
+ " IF statement: \"%s\"", mapname, lineno, p);
+ msg_warn("regexp map %s, line %d: do not prepend whitespace"
+ " to statements between IF and ENDIF", mapname, lineno);
+ }
if ((expr = dict_regexp_compile_pat(mapname, lineno, &pattern)) == 0)
return (0);
if_rule = (DICT_REGEXP_IF_RULE *)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/util/match_ops.c new/postfix-2.5.3/src/util/match_ops.c
--- old/postfix-2.5.1/src/util/match_ops.c 2006-06-15 20:07:16.000000000 +0200
+++ new/postfix-2.5.3/src/util/match_ops.c 2008-06-06 21:52:05.000000000 +0200
@@ -234,12 +234,20 @@
* Postfix; if not, then Postfix has no business dealing with IPv4
* addresses anyway.
*
- * - Don't bother if the pattern is a bare IPv4 address. That form would
- * have been matched with the strcasecmp() call above.
+ * - Don't bother unless the pattern is either an IPv6 address or net/mask.
*
- * - Don't bother if the pattern isn't an address or address/mask.
+ * We can safely skip IPv4 address patterns because their form is
+ * unambiguous and they did not match in the strcasecmp() calls above.
+ *
+ * XXX We MUST skip (parent) domain names, which may appear in NAMADR_LIST
+ * input, to avoid triggering false cidr_match_parse() errors.
+ *
+ * The last two conditions below are for backwards compatibility with
+ * earlier Postfix versions: don't abort with fatal errors on junk that
+ * was silently ignored (principle of least astonishment).
*/
if (!strchr(addr, ':') != !strchr(pattern, ':')
+ || pattern[strcspn(pattern, ":/")] == 0
|| pattern[strspn(pattern, V4_ADDR_STRING_CHARS)] == 0
|| pattern[strspn(pattern, V6_ADDR_STRING_CHARS "[]/")] != 0)
return (0);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/util/vstream_tweak.c new/postfix-2.5.3/src/util/vstream_tweak.c
--- old/postfix-2.5.1/src/util/vstream_tweak.c 2007-07-31 23:14:02.000000000 +0200
+++ new/postfix-2.5.3/src/util/vstream_tweak.c 2008-07-17 17:03:07.000000000 +0200
@@ -115,7 +115,7 @@
*/
#ifdef VSTREAM_CTL_BUFSIZE
if (mss > 0) {
- if (mss < __MAXINT__(ssize_t) /2)
+ if (mss < INT_MAX / 2)
mss *= 2;
vstream_control(fp,
VSTREAM_CTL_BUFSIZE, (ssize_t) mss,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/virtual/mailbox.c new/postfix-2.5.3/src/virtual/mailbox.c
--- old/postfix-2.5.1/src/virtual/mailbox.c 2006-06-26 14:59:19.000000000 +0200
+++ new/postfix-2.5.3/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200
@@ -125,6 +125,12 @@
msg_warn("recipient %s: destination %s is not a regular file",
state.msg_attr.rcpt.address, usr_attr.mailbox);
dsb_simple(why, "5.3.5", "mail system configuration error");
+ } else if (var_strict_mbox_owner && st.st_uid != usr_attr.uid) {
+ vstream_fclose(mp->fp);
+ dsb_simple(why, "4.2.0",
+ "destination %s is not owned by recipient", usr_attr.mailbox);
+ msg_warn("specify \"%s = no\" to ignore mailbox ownership mismatch",
+ VAR_STRICT_MBOX_OWNER);
} else {
end = vstream_fseek(mp->fp, (off_t) 0, SEEK_END);
mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr), mp->fp,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/virtual/virtual.c new/postfix-2.5.3/src/virtual/virtual.c
--- old/postfix-2.5.1/src/virtual/virtual.c 2008-01-08 21:35:08.000000000 +0100
+++ new/postfix-2.5.3/src/virtual/virtual.c 2008-07-27 23:00:11.000000000 +0200
@@ -183,6 +183,10 @@
/* .IP "\fBvirtual_transport (virtual)\fR"
/* The default mail delivery transport and next-hop destination for
/* final delivery to domains listed with $virtual_mailbox_domains.
+/* .PP
+/* Available in Postfix version 2.5.3 and later:
+/* .IP "\fBstrict_mailbox_ownership (yes)\fR"
+/* Defer delivery when a mailbox file is not owned by its recipient.
/* LOCKING CONTROLS
/* .ad
/* .fi
@@ -329,6 +333,7 @@
char *var_virt_mailbox_lock;
int var_virt_mailbox_limit;
char *var_mail_spool_dir; /* XXX dependency fix */
+bool var_strict_mbox_owner;
/*
* Mappings.
@@ -504,6 +509,10 @@
VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0,
0,
};
+ static const CONFIG_BOOL_TABLE bool_table[] = {
+ VAR_STRICT_MBOX_OWNER, DEF_STRICT_MBOX_OWNER, &var_strict_mbox_owner,
+ 0,
+ };
/*
* Fingerprint executables and core dumps.
@@ -513,6 +522,7 @@
single_server_main(argc, argv, local_service,
MAIL_SERVER_INT_TABLE, int_table,
MAIL_SERVER_STR_TABLE, str_table,
+ MAIL_SERVER_BOOL_TABLE, bool_table,
MAIL_SERVER_PRE_INIT, pre_init,
MAIL_SERVER_POST_INIT, post_init,
MAIL_SERVER_PRE_ACCEPT, pre_accept,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-2.5.1/src/xsasl/xsasl_dovecot_server.c new/postfix-2.5.3/src/xsasl/xsasl_dovecot_server.c
--- old/postfix-2.5.1/src/xsasl/xsasl_dovecot_server.c 2008-01-08 21:36:13.000000000 +0100
+++ new/postfix-2.5.3/src/xsasl/xsasl_dovecot_server.c 2008-03-17 00:09:04.000000000 +0100
@@ -50,6 +50,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef STRCASECMP_IN_STRINGS_H
+#include <strings.h>
+#endif
+
/* Utility library. */
#include <msg.h>
@@ -60,6 +64,7 @@
#include <vstream.h>
#include <vstring_vstream.h>
#include <name_mask.h>
+#include <argv.h>
/* Global library. */
@@ -156,6 +161,7 @@
VSTRING *sasl_line;
unsigned int sec_props; /* Postfix mechanism filter */
char *mechanism_list; /* filtered mechanism list */
+ ARGV *mechanism_argv; /* ditto */
} XSASL_DOVECOT_SERVER;
/*
@@ -208,7 +214,8 @@
/* xsasl_dovecot_server_mech_filter - filter server mechanism list */
-static char *xsasl_dovecot_server_mech_filter(XSASL_DCSRV_MECH *mechanism_list,
+static char *xsasl_dovecot_server_mech_filter(ARGV *mechanism_argv,
+ XSASL_DCSRV_MECH *mechanism_list,
unsigned int conf_props)
{
const char *myname = "xsasl_dovecot_server_mech_filter";
@@ -226,6 +233,7 @@
if (VSTRING_LEN(mechanisms_str) > 0)
VSTRING_ADDCH(mechanisms_str, ' ');
vstring_strcat(mechanisms_str, mp->mech_name);
+ argv_add(mechanism_argv, mp->mech_name, (char *) 0);
if (msg_verbose)
msg_info("%s: keep mechanism: %s", myname, mp->mech_name);
} else {
@@ -400,6 +408,7 @@
server->service = mystrdup(service);
server->last_request_id = 0;
server->mechanism_list = 0;
+ server->mechanism_argv = 0;
server->sec_props =
name_mask_opt(myname, xsasl_dovecot_conf_sec_props,
sec_props, NAME_MASK_ANY_CASE | NAME_MASK_FATAL);
@@ -417,10 +426,13 @@
if (xsasl_dovecot_server_connect(server->impl) < 0)
return (0);
}
- if (server->mechanism_list == 0)
+ if (server->mechanism_list == 0) {
+ server->mechanism_argv = argv_alloc(2);
server->mechanism_list =
- xsasl_dovecot_server_mech_filter(server->impl->mechanism_list,
+ xsasl_dovecot_server_mech_filter(server->mechanism_argv,
+ server->impl->mechanism_list,
server->sec_props);
+ }
return (server->mechanism_list[0] ? server->mechanism_list : 0);
}
@@ -433,8 +445,10 @@
vstring_free(server->sasl_line);
if (server->username)
myfree(server->username);
- if (server->mechanism_list)
+ if (server->mechanism_list) {
myfree(server->mechanism_list);
+ argv_free(server->mechanism_argv);
+ }
myfree(server->service);
myfree((char *) server);
}
@@ -558,6 +572,7 @@
const char *myname = "xsasl_dovecot_server_first";
XSASL_DOVECOT_SERVER *server = (XSASL_DOVECOT_SERVER *) xp;
int i;
+ char **cpp;
#define IFELSE(e1,e2,e3) ((e1) ? (e2) : (e3))
@@ -566,6 +581,17 @@
IFELSE(init_response, ", init_response ", ""),
IFELSE(init_response, init_response, ""));
+ if (server->mechanism_argv == 0)
+ msg_panic("%s: no mechanism list", myname);
+
+ for (cpp = server->mechanism_argv->argv; /* see below */ ; cpp++) {
+ if (*cpp == 0) {
+ vstring_strcpy(reply, "Invalid authentication mechanism");
+ return XSASL_AUTH_FAIL;
+ }
+ if (strcasecmp(sasl_method, *cpp) == 0)
+ break;
+ }
if (init_response)
if (!is_valid_base64(init_response)) {
vstring_strcpy(reply, "Invalid base64 data in initial response");
++++++ postfix-SuSE.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/postfix-fw new/postfix-SuSE/postfix-fw
--- old/postfix-SuSE/postfix-fw 2007-02-26 10:29:47.000000000 +0100
+++ new/postfix-SuSE/postfix-fw 2008-08-06 13:42:31.000000000 +0200
@@ -1,3 +1,4 @@
+## Name: SMTP with Postfix
## Description: Firewall Configuration file for postfix
# space separated list of allowed TCP ports
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/rc.postfix new/postfix-SuSE/rc.postfix
--- old/postfix-SuSE/rc.postfix 2007-06-21 08:30:20.000000000 +0200
+++ new/postfix-SuSE/rc.postfix 2008-07-30 10:14:30.000000000 +0200
@@ -10,7 +10,7 @@
#
### BEGIN INIT INFO
# Provides: smtp sendmail postfix
-# Required-Start: $network $named $syslog $time
+# Required-Start: $network $named $syslog $time $remote_fs
# Should-Start: cyrus ldap ypbind openslp amavisd
# Required-Stop:
# Default-Start: 3 5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/SuSEconfig.postfix new/postfix-SuSE/SuSEconfig.postfix
--- old/postfix-SuSE/SuSEconfig.postfix 2008-07-09 15:02:48.000000000 +0200
+++ new/postfix-SuSE/SuSEconfig.postfix 2008-07-17 09:42:26.000000000 +0200
@@ -101,9 +101,9 @@
# CA
CAPATH=`postconf -h smtpd_tls_CApath`
- if [ "CAPATH" ]
+ if [ "$CAPATH" ]
then
- cpifnewer $CAPATH ./$CAPATH
+ cpifnewer "$CAPATH/*" ./$CAPATH
fi
# PAM
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 kernel-source
checked in at Thu Aug 7 01:33:45 CEST 2008.
--------
--- kernel-source/kernel-debug.changes 2008-07-17 18:37:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-08-06 15:52:08.149447000 +0200
@@ -1,0 +2,975 @@
+Wed Aug 6 12:59:59 CEST 2008 - olh(a)suse.de
+
+- add patches.suse/ppc-no-LDFLAGS_MODULE.patch
+ do not link external modules against arch/powerpc/lib/crtsavres.o
+
+-------------------------------------------------------------------
+Tue Aug 5 21:41:43 CEST 2008 - jeffm(a)suse.de
+
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: reiserfs:
+ audit transaction ids to always be unsigned ints (bnc#410847).
+
+-------------------------------------------------------------------
+Tue Aug 5 21:35:11 CEST 2008 - jeffm(a)suse.de
+
+- README.BRANCH: Took ownership of 11.1 tree.
+
+-------------------------------------------------------------------
+Tue Aug 5 21:34:11 CEST 2008 - jeffm(a)suse.de
+
+- README: Changed w3d links to wiki links.
+
+-------------------------------------------------------------------
+Tue Aug 5 17:03:22 CEST 2008 - ghaskins(a)suse.de
+
+Fixed misnamed rt_trace to rt_timing
+- config/x86_64/rt_trace: Delete.
+- Update config files.
+- config.conf:
+
+-------------------------------------------------------------------
+Tue Aug 5 16:10:50 CEST 2008 - ghaskins(a)suse.de
+
+Added x86_64/rt_trace kernel flavor (based on ftrace)
+
+- Update config files.
+- config.conf:
+
+-------------------------------------------------------------------
+Tue Aug 5 15:27:26 CEST 2008 - ghaskins(a)suse.de
+
+Guarded by +RT
+- Fix rtmutex-tester build problem with rt_debug
+- patches.rt/rtmutex-convert-to-libpi.patch: rtmutex: convert
+ rtmutexes to fully use the PI library.
+
+
+-------------------------------------------------------------------
+Tue Aug 5 14:20:38 CEST 2008 - ghaskins(a)suse.de
+
+Guarded by +RT
+- Remove version.patch to stop build breakage
+
+-------------------------------------------------------------------
+Tue Aug 5 11:43:31 CEST 2008 - jjohansen(a)suse.de
+
+- update apparmor patches with fixes for
+ - broken getcwd (bnc#413915)
+ - ref counting bug in getcwd and d_namespace_path when used
+ on disconnected paths (bnc#414607)
+ - typeo in patches that keep selinux from compiling (bnc#414609)
+ - incorporate smack patch into base apparmor patches, so
+ that smack can be built (bnc#414610)
+
+-------------------------------------------------------------------
+Tue Aug 5 11:33:17 CEST 2008 - jslaby(a)suse.de
+
+- patches.fixes/ath5k-fix-memory-corruption.patch: Ath5k: fix
+ memory corruption (bnc#414635).
+- patches.fixes/ath5k-kill-tasklets-on-shutdown.patch: Ath5k:
+ kill tasklets on shutdown (bnc#414638).
+
+-------------------------------------------------------------------
+Mon Aug 4 20:56:15 CEST 2008 - gregkh(a)suse.de
+
+- README.BRANCH: added file.
+
+-------------------------------------------------------------------
+Mon Aug 4 13:37:56 CEST 2008 - olh(a)suse.de
+
+- disable CONFIG_SECURITY_ROOTPLUG because /init in initrd will
+ not run if USB is compiled in and a specific USB device is not
+ present
+
+-------------------------------------------------------------------
+Mon Aug 4 12:42:38 CEST 2008 - jslaby(a)suse.de
+
+- patches.fixes/tpm-write-data-types.patch: tpm: Use correct
+ data types for sizes in tpm_write() and tpm_read() (bnc#400211).
+
+-------------------------------------------------------------------
+Fri Aug 1 21:45:24 CEST 2008 - ghaskins(a)suse.de
+
+PI rework v0.5 and a fix from upstream for 26-rt1
+- patches.rt/26-rt1-chirag.patch: This patch should solve some
+ of the bug messages..
+- patches.rt/add-generalized-pi-interface.patch: add generalized
+ priority-inheritance interface.
+- patches.rt/tie-pi-into-task.patch: sched: add the basic PI
+ infrastructure to the task_struct.
+- patches.rt/rtmutex-initialize-waiters.patch: rtmutex: formally
+ initialize the rt_mutex_waiters.
+- patches.rt/rtmutex-add_readers.patch: RT: wrap the rt_rwlock
+ "add reader" logic.
+- patches.rt/rtmutex-use-runtime-init.patch: rtmutex: use runtime
+ init for rtmutexes.
+- patches.rt/rtmutex-convert-to-libpi.patch: rtmutex: convert
+ rtmutexes to fully use the PI library.
+- patches.rt/rtmutex-defer-pi-until-sleepy.patch: rtmutex:
+ pi-boost locks as late as possible.
+
+-------------------------------------------------------------------
+Fri Aug 1 16:16:29 CEST 2008 - schwab(a)suse.de
+
+- Reenable EFI_RTC.
+
+-------------------------------------------------------------------
+Fri Aug 1 14:12:30 CEST 2008 - trenn(a)suse.de
+
+- Update config files.
+ Unset on forgotten archs:
+ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
+
+-------------------------------------------------------------------
+Fri Aug 1 13:49:18 CEST 2008 - trenn(a)suse.de
+
+- patches.fixes/x86_hpet_amd_quirk.patch: Workaround a hpet BIOS
+ bug which is common on latest AMD driven boards (bnc#387053).
+
+-------------------------------------------------------------------
+Fri Aug 1 13:42:53 CEST 2008 - sassmann(a)suse.de
+
+Add boot interrupt patches from linux-2.6-tip
+- patches.arch/x86-acpi-reroute-PCI-interrupt-to-legacy-boot-interrupt.patch
+- patches.arch/x86-add-PCI-IDs-for-devices-that-need-boot-irq-quirk.patch
+- patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch
+- patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch
+- patches.arch/x86-disable-intel-boot-interrupt-generation.patch
+- patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch
+- patches.arch/x86-introduce-pci-ioapicreroute-kernel-cmdline.patch
+- patches.arch/x86-introduce-pci-noioapicquirk-kernel-cmdline.patch
+- Update config files.
+ * reroute of boot interrupts is enabled for RT only!
+
+-------------------------------------------------------------------
+Thu Jul 31 19:30:14 CEST 2008 - sdietrich(a)suse.de
+
+Update to 2.6.26-rt1:
+- config.conf: Enable i386/x86_64 - RT / RT_debug
+- Update config files:
+ * Sync to default config.
+ * Disable (broken):
+ - Novell Netware Filesystem support (novfs) (EXPERIMENTAL) (NOVFS)
+ - ISP 1760 HCD support (USB_ISP1760_HCD)
+ - KDB
+ - QLogic InfiniPath Driver (INFINIBAND_IPATH)
+
+Remove obsolete patches:
+------------------------
+- patches.rt/arm-cmpxchg-support-armv6.patch: Delete.
+- patches.rt/arm-cmpxchg.patch: Delete.
+- patches.rt/arm-fix-atomic-cmpxchg.patch: Delete.
+- patches.rt/arm-leds-timer.patch: Delete.
+- patches.rt/arm-omap-03.patch: Delete.
+- patches.rt/arm-omap-04.patch: Delete.
+- patches.rt/disable-sched-rt-groups.patch: Delete.
+- patches.rt/drivers-edac-add-support-for-HS21XM-SMI-remediation:
+ Delete.
+- patches.rt/drivers-edac-add-support-for-HS21_LS21-SMI-remediation:
+ Delete.
+- patches.rt/drivers-edac-add-sysfs_notify-calls.patch: Delete.
+- patches.rt/drivers-edac-i5000-turn-off-unsupported-check:
+ Delete.
+- patches.rt/drivers-edac-new-amd64.patch: Delete.
+- patches.rt/drivers-edac-new-k8-rev-f.patch: Delete.
+- patches.rt/drivers-edac-prevent-potential-printk-storm: Delete.
+- patches.rt/drivers-edac-test_device.patch: Delete.
+- patches.rt/ep93xx-clockevents-fix.patch: Delete.
+- patches.rt/ep93xx-clockevents.patch: Delete.
+- patches.rt/ep93xx-timer-accuracy.patch: Delete.
+- patches.rt/fix-alternate_node_alloc.patch: Delete.
+- patches.rt/fix-irq-flags-size.patch: Delete.
+- patches.rt/foo.patch: Delete.
+- patches.rt/ftrace-add-nr_syscalls.patch: Delete.
+- patches.rt/ftrace-alloc-pages.patch: Delete.
+- patches.rt/ftrace-cpu-clock-update.patch: Delete.
+- patches.rt/ftrace-debug-use-preempt-disable-notrace.patch:
+ Delete.
+- patches.rt/ftrace-direct-calls.patch: Delete.
+- patches.rt/ftrace-disable-daemon.patch: Delete.
+- patches.rt/ftrace-dont-use-raw-irq-save.patch: Delete.
+- patches.rt/ftrace-eventtrace-fixup.patch: Delete.
+- patches.rt/ftrace-filter-functions.patch: Delete.
+- patches.rt/ftrace-fix-ip.patch: Delete.
+- patches.rt/ftrace-flip-fix.patch: Delete.
+- patches.rt/ftrace-handle-time-outside-of-lockdep.patch: Delete.
+- patches.rt/ftrace-irqsoff-smp-processor-id-fix.patch: Delete.
+- patches.rt/ftrace-lockdep-notrace-annotations.patch: Delete.
++++ 778 more lines (skipped)
++++ between kernel-source/kernel-debug.changes
++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
New Changes file:
--- /dev/null 2006-09-20 18:56:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-rt.changes 2008-08-06 15:52:09.503087000 +0200
@@ -0,0 +1,39817 @@
+-------------------------------------------------------------------
+Wed Aug 6 12:59:59 CEST 2008 - olh(a)suse.de
+
+- add patches.suse/ppc-no-LDFLAGS_MODULE.patch
+ do not link external modules against arch/powerpc/lib/crtsavres.o
+
+-------------------------------------------------------------------
+Tue Aug 5 21:41:43 CEST 2008 - jeffm(a)suse.de
+
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: reiserfs:
+ audit transaction ids to always be unsigned ints (bnc#410847).
+
+-------------------------------------------------------------------
+Tue Aug 5 21:35:11 CEST 2008 - jeffm(a)suse.de
+
+- README.BRANCH: Took ownership of 11.1 tree.
+
+-------------------------------------------------------------------
+Tue Aug 5 21:34:11 CEST 2008 - jeffm(a)suse.de
+
+- README: Changed w3d links to wiki links.
+
+-------------------------------------------------------------------
+Tue Aug 5 17:03:22 CEST 2008 - ghaskins(a)suse.de
+
+Fixed misnamed rt_trace to rt_timing
+- config/x86_64/rt_trace: Delete.
+- Update config files.
+- config.conf:
+
+-------------------------------------------------------------------
+Tue Aug 5 16:10:50 CEST 2008 - ghaskins(a)suse.de
+
+Added x86_64/rt_trace kernel flavor (based on ftrace)
+
+- Update config files.
+- config.conf:
+
+-------------------------------------------------------------------
+Tue Aug 5 15:27:26 CEST 2008 - ghaskins(a)suse.de
+
+Guarded by +RT
+- Fix rtmutex-tester build problem with rt_debug
+- patches.rt/rtmutex-convert-to-libpi.patch: rtmutex: convert
+ rtmutexes to fully use the PI library.
+
+
+-------------------------------------------------------------------
+Tue Aug 5 14:20:38 CEST 2008 - ghaskins(a)suse.de
+
+Guarded by +RT
+- Remove version.patch to stop build breakage
+
+-------------------------------------------------------------------
+Tue Aug 5 11:43:31 CEST 2008 - jjohansen(a)suse.de
+
+- update apparmor patches with fixes for
+ - broken getcwd (bnc#413915)
+ - ref counting bug in getcwd and d_namespace_path when used
+ on disconnected paths (bnc#414607)
+ - typeo in patches that keep selinux from compiling (bnc#414609)
+ - incorporate smack patch into base apparmor patches, so
+ that smack can be built (bnc#414610)
+
+-------------------------------------------------------------------
+Tue Aug 5 11:33:17 CEST 2008 - jslaby(a)suse.de
+
+- patches.fixes/ath5k-fix-memory-corruption.patch: Ath5k: fix
+ memory corruption (bnc#414635).
+- patches.fixes/ath5k-kill-tasklets-on-shutdown.patch: Ath5k:
+ kill tasklets on shutdown (bnc#414638).
+
+-------------------------------------------------------------------
+Mon Aug 4 20:56:15 CEST 2008 - gregkh(a)suse.de
+
+- README.BRANCH: added file.
+
+-------------------------------------------------------------------
+Mon Aug 4 13:37:56 CEST 2008 - olh(a)suse.de
+
+- disable CONFIG_SECURITY_ROOTPLUG because /init in initrd will
+ not run if USB is compiled in and a specific USB device is not
+ present
+
+-------------------------------------------------------------------
+Mon Aug 4 12:42:38 CEST 2008 - jslaby(a)suse.de
+
+- patches.fixes/tpm-write-data-types.patch: tpm: Use correct
+ data types for sizes in tpm_write() and tpm_read() (bnc#400211).
+
+-------------------------------------------------------------------
+Fri Aug 1 21:45:24 CEST 2008 - ghaskins(a)suse.de
+
+PI rework v0.5 and a fix from upstream for 26-rt1
+- patches.rt/26-rt1-chirag.patch: This patch should solve some
+ of the bug messages..
+- patches.rt/add-generalized-pi-interface.patch: add generalized
+ priority-inheritance interface.
+- patches.rt/tie-pi-into-task.patch: sched: add the basic PI
+ infrastructure to the task_struct.
+- patches.rt/rtmutex-initialize-waiters.patch: rtmutex: formally
+ initialize the rt_mutex_waiters.
+- patches.rt/rtmutex-add_readers.patch: RT: wrap the rt_rwlock
+ "add reader" logic.
+- patches.rt/rtmutex-use-runtime-init.patch: rtmutex: use runtime
+ init for rtmutexes.
+- patches.rt/rtmutex-convert-to-libpi.patch: rtmutex: convert
+ rtmutexes to fully use the PI library.
+- patches.rt/rtmutex-defer-pi-until-sleepy.patch: rtmutex:
+ pi-boost locks as late as possible.
+
+-------------------------------------------------------------------
+Fri Aug 1 16:16:29 CEST 2008 - schwab(a)suse.de
+
+- Reenable EFI_RTC.
+
+-------------------------------------------------------------------
+Fri Aug 1 14:12:30 CEST 2008 - trenn(a)suse.de
+
+- Update config files.
+ Unset on forgotten archs:
+ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
+
+-------------------------------------------------------------------
+Fri Aug 1 13:49:18 CEST 2008 - trenn(a)suse.de
+
+- patches.fixes/x86_hpet_amd_quirk.patch: Workaround a hpet BIOS
+ bug which is common on latest AMD driven boards (bnc#387053).
+
+-------------------------------------------------------------------
+Fri Aug 1 13:42:53 CEST 2008 - sassmann(a)suse.de
+
+Add boot interrupt patches from linux-2.6-tip
+- patches.arch/x86-acpi-reroute-PCI-interrupt-to-legacy-boot-interrupt.patch
+- patches.arch/x86-add-PCI-IDs-for-devices-that-need-boot-irq-quirk.patch
+- patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch
+- patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch
+- patches.arch/x86-disable-intel-boot-interrupt-generation.patch
+- patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch
+- patches.arch/x86-introduce-pci-ioapicreroute-kernel-cmdline.patch
+- patches.arch/x86-introduce-pci-noioapicquirk-kernel-cmdline.patch
+- Update config files.
+ * reroute of boot interrupts is enabled for RT only!
+
+-------------------------------------------------------------------
+Thu Jul 31 19:30:14 CEST 2008 - sdietrich(a)suse.de
+
+Update to 2.6.26-rt1:
+- config.conf: Enable i386/x86_64 - RT / RT_debug
+- Update config files:
+ * Sync to default config.
+ * Disable (broken):
+ - Novell Netware Filesystem support (novfs) (EXPERIMENTAL) (NOVFS)
+ - ISP 1760 HCD support (USB_ISP1760_HCD)
+ - KDB
+ - QLogic InfiniPath Driver (INFINIBAND_IPATH)
+
+Remove obsolete patches:
+------------------------
+- patches.rt/arm-cmpxchg-support-armv6.patch: Delete.
+- patches.rt/arm-cmpxchg.patch: Delete.
+- patches.rt/arm-fix-atomic-cmpxchg.patch: Delete.
+- patches.rt/arm-leds-timer.patch: Delete.
+- patches.rt/arm-omap-03.patch: Delete.
+- patches.rt/arm-omap-04.patch: Delete.
+- patches.rt/disable-sched-rt-groups.patch: Delete.
+- patches.rt/drivers-edac-add-support-for-HS21XM-SMI-remediation:
+ Delete.
+- patches.rt/drivers-edac-add-support-for-HS21_LS21-SMI-remediation:
+ Delete.
+- patches.rt/drivers-edac-add-sysfs_notify-calls.patch: Delete.
+- patches.rt/drivers-edac-i5000-turn-off-unsupported-check:
+ Delete.
+- patches.rt/drivers-edac-new-amd64.patch: Delete.
+- patches.rt/drivers-edac-new-k8-rev-f.patch: Delete.
+- patches.rt/drivers-edac-prevent-potential-printk-storm: Delete.
+- patches.rt/drivers-edac-test_device.patch: Delete.
+- patches.rt/ep93xx-clockevents-fix.patch: Delete.
+- patches.rt/ep93xx-clockevents.patch: Delete.
+- patches.rt/ep93xx-timer-accuracy.patch: Delete.
+- patches.rt/fix-alternate_node_alloc.patch: Delete.
+- patches.rt/fix-irq-flags-size.patch: Delete.
+- patches.rt/foo.patch: Delete.
+- patches.rt/ftrace-add-nr_syscalls.patch: Delete.
+- patches.rt/ftrace-alloc-pages.patch: Delete.
+- patches.rt/ftrace-cpu-clock-update.patch: Delete.
+- patches.rt/ftrace-debug-use-preempt-disable-notrace.patch:
+ Delete.
+- patches.rt/ftrace-direct-calls.patch: Delete.
+- patches.rt/ftrace-disable-daemon.patch: Delete.
+- patches.rt/ftrace-dont-use-raw-irq-save.patch: Delete.
+- patches.rt/ftrace-eventtrace-fixup.patch: Delete.
+- patches.rt/ftrace-filter-functions.patch: Delete.
+- patches.rt/ftrace-fix-ip.patch: Delete.
+- patches.rt/ftrace-flip-fix.patch: Delete.
+- patches.rt/ftrace-handle-time-outside-of-lockdep.patch: Delete.
+- patches.rt/ftrace-irqsoff-smp-processor-id-fix.patch: Delete.
++++ 39620 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-rt.changes
New Changes file:
kernel-rt_debug.changes: same change
New Changes file:
kernel-rt_timing.changes: same change
--- kernel-source/kernel-s390.changes 2008-07-17 18:37:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-s390.changes 2008-08-06 15:52:09.903687000 +0200
@@ -1,0 +2,975 @@
+Wed Aug 6 12:59:59 CEST 2008 - olh(a)suse.de
+
+- add patches.suse/ppc-no-LDFLAGS_MODULE.patch
+ do not link external modules against arch/powerpc/lib/crtsavres.o
+
+-------------------------------------------------------------------
+Tue Aug 5 21:41:43 CEST 2008 - jeffm(a)suse.de
+
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: reiserfs:
+ audit transaction ids to always be unsigned ints (bnc#410847).
+
+-------------------------------------------------------------------
+Tue Aug 5 21:35:11 CEST 2008 - jeffm(a)suse.de
+
+- README.BRANCH: Took ownership of 11.1 tree.
+
+-------------------------------------------------------------------
+Tue Aug 5 21:34:11 CEST 2008 - jeffm(a)suse.de
+
+- README: Changed w3d links to wiki links.
+
+-------------------------------------------------------------------
+Tue Aug 5 17:03:22 CEST 2008 - ghaskins(a)suse.de
+
+Fixed misnamed rt_trace to rt_timing
+- config/x86_64/rt_trace: Delete.
+- Update config files.
+- config.conf:
+
+-------------------------------------------------------------------
+Tue Aug 5 16:10:50 CEST 2008 - ghaskins(a)suse.de
+
+Added x86_64/rt_trace kernel flavor (based on ftrace)
+
+- Update config files.
+- config.conf:
+
+-------------------------------------------------------------------
+Tue Aug 5 15:27:26 CEST 2008 - ghaskins(a)suse.de
+
+Guarded by +RT
+- Fix rtmutex-tester build problem with rt_debug
+- patches.rt/rtmutex-convert-to-libpi.patch: rtmutex: convert
+ rtmutexes to fully use the PI library.
+
+
+-------------------------------------------------------------------
+Tue Aug 5 14:20:38 CEST 2008 - ghaskins(a)suse.de
+
+Guarded by +RT
+- Remove version.patch to stop build breakage
+
+-------------------------------------------------------------------
+Tue Aug 5 11:43:31 CEST 2008 - jjohansen(a)suse.de
+
+- update apparmor patches with fixes for
+ - broken getcwd (bnc#413915)
+ - ref counting bug in getcwd and d_namespace_path when used
+ on disconnected paths (bnc#414607)
+ - typeo in patches that keep selinux from compiling (bnc#414609)
+ - incorporate smack patch into base apparmor patches, so
+ that smack can be built (bnc#414610)
+
+-------------------------------------------------------------------
+Tue Aug 5 11:33:17 CEST 2008 - jslaby(a)suse.de
+
+- patches.fixes/ath5k-fix-memory-corruption.patch: Ath5k: fix
+ memory corruption (bnc#414635).
+- patches.fixes/ath5k-kill-tasklets-on-shutdown.patch: Ath5k:
+ kill tasklets on shutdown (bnc#414638).
+
+-------------------------------------------------------------------
+Mon Aug 4 20:56:15 CEST 2008 - gregkh(a)suse.de
+
+- README.BRANCH: added file.
+
+-------------------------------------------------------------------
+Mon Aug 4 13:37:56 CEST 2008 - olh(a)suse.de
+
+- disable CONFIG_SECURITY_ROOTPLUG because /init in initrd will
+ not run if USB is compiled in and a specific USB device is not
+ present
+
+-------------------------------------------------------------------
+Mon Aug 4 12:42:38 CEST 2008 - jslaby(a)suse.de
+
+- patches.fixes/tpm-write-data-types.patch: tpm: Use correct
+ data types for sizes in tpm_write() and tpm_read() (bnc#400211).
+
+-------------------------------------------------------------------
+Fri Aug 1 21:45:24 CEST 2008 - ghaskins(a)suse.de
+
+PI rework v0.5 and a fix from upstream for 26-rt1
+- patches.rt/26-rt1-chirag.patch: This patch should solve some
+ of the bug messages..
+- patches.rt/add-generalized-pi-interface.patch: add generalized
+ priority-inheritance interface.
+- patches.rt/tie-pi-into-task.patch: sched: add the basic PI
+ infrastructure to the task_struct.
+- patches.rt/rtmutex-initialize-waiters.patch: rtmutex: formally
+ initialize the rt_mutex_waiters.
+- patches.rt/rtmutex-add_readers.patch: RT: wrap the rt_rwlock
+ "add reader" logic.
+- patches.rt/rtmutex-use-runtime-init.patch: rtmutex: use runtime
+ init for rtmutexes.
+- patches.rt/rtmutex-convert-to-libpi.patch: rtmutex: convert
+ rtmutexes to fully use the PI library.
+- patches.rt/rtmutex-defer-pi-until-sleepy.patch: rtmutex:
+ pi-boost locks as late as possible.
+
+-------------------------------------------------------------------
+Fri Aug 1 16:16:29 CEST 2008 - schwab(a)suse.de
+
+- Reenable EFI_RTC.
+
+-------------------------------------------------------------------
+Fri Aug 1 14:12:30 CEST 2008 - trenn(a)suse.de
+
+- Update config files.
+ Unset on forgotten archs:
+ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
+
+-------------------------------------------------------------------
+Fri Aug 1 13:49:18 CEST 2008 - trenn(a)suse.de
+
+- patches.fixes/x86_hpet_amd_quirk.patch: Workaround a hpet BIOS
+ bug which is common on latest AMD driven boards (bnc#387053).
+
+-------------------------------------------------------------------
+Fri Aug 1 13:42:53 CEST 2008 - sassmann(a)suse.de
+
+Add boot interrupt patches from linux-2.6-tip
+- patches.arch/x86-acpi-reroute-PCI-interrupt-to-legacy-boot-interrupt.patch
+- patches.arch/x86-add-PCI-IDs-for-devices-that-need-boot-irq-quirk.patch
+- patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch
+- patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch
+- patches.arch/x86-disable-intel-boot-interrupt-generation.patch
+- patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch
+- patches.arch/x86-introduce-pci-ioapicreroute-kernel-cmdline.patch
+- patches.arch/x86-introduce-pci-noioapicquirk-kernel-cmdline.patch
+- Update config files.
+ * reroute of boot interrupts is enabled for RT only!
+
+-------------------------------------------------------------------
+Thu Jul 31 19:30:14 CEST 2008 - sdietrich(a)suse.de
+
+Update to 2.6.26-rt1:
+- config.conf: Enable i386/x86_64 - RT / RT_debug
+- Update config files:
+ * Sync to default config.
+ * Disable (broken):
+ - Novell Netware Filesystem support (novfs) (EXPERIMENTAL) (NOVFS)
+ - ISP 1760 HCD support (USB_ISP1760_HCD)
+ - KDB
+ - QLogic InfiniPath Driver (INFINIBAND_IPATH)
+
+Remove obsolete patches:
+------------------------
+- patches.rt/arm-cmpxchg-support-armv6.patch: Delete.
+- patches.rt/arm-cmpxchg.patch: Delete.
+- patches.rt/arm-fix-atomic-cmpxchg.patch: Delete.
+- patches.rt/arm-leds-timer.patch: Delete.
+- patches.rt/arm-omap-03.patch: Delete.
+- patches.rt/arm-omap-04.patch: Delete.
+- patches.rt/disable-sched-rt-groups.patch: Delete.
+- patches.rt/drivers-edac-add-support-for-HS21XM-SMI-remediation:
+ Delete.
+- patches.rt/drivers-edac-add-support-for-HS21_LS21-SMI-remediation:
+ Delete.
+- patches.rt/drivers-edac-add-sysfs_notify-calls.patch: Delete.
+- patches.rt/drivers-edac-i5000-turn-off-unsupported-check:
+ Delete.
+- patches.rt/drivers-edac-new-amd64.patch: Delete.
+- patches.rt/drivers-edac-new-k8-rev-f.patch: Delete.
+- patches.rt/drivers-edac-prevent-potential-printk-storm: Delete.
+- patches.rt/drivers-edac-test_device.patch: Delete.
+- patches.rt/ep93xx-clockevents-fix.patch: Delete.
+- patches.rt/ep93xx-clockevents.patch: Delete.
+- patches.rt/ep93xx-timer-accuracy.patch: Delete.
+- patches.rt/fix-alternate_node_alloc.patch: Delete.
+- patches.rt/fix-irq-flags-size.patch: Delete.
+- patches.rt/foo.patch: Delete.
+- patches.rt/ftrace-add-nr_syscalls.patch: Delete.
+- patches.rt/ftrace-alloc-pages.patch: Delete.
+- patches.rt/ftrace-cpu-clock-update.patch: Delete.
+- patches.rt/ftrace-debug-use-preempt-disable-notrace.patch:
+ Delete.
+- patches.rt/ftrace-direct-calls.patch: Delete.
+- patches.rt/ftrace-disable-daemon.patch: Delete.
+- patches.rt/ftrace-dont-use-raw-irq-save.patch: Delete.
+- patches.rt/ftrace-eventtrace-fixup.patch: Delete.
+- patches.rt/ftrace-filter-functions.patch: Delete.
+- patches.rt/ftrace-fix-ip.patch: Delete.
+- patches.rt/ftrace-flip-fix.patch: Delete.
+- patches.rt/ftrace-handle-time-outside-of-lockdep.patch: Delete.
+- patches.rt/ftrace-irqsoff-smp-processor-id-fix.patch: Delete.
+- patches.rt/ftrace-lockdep-notrace-annotations.patch: Delete.
++++ 778 more lines (skipped)
++++ between kernel-source/kernel-s390.changes
++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-s390.changes
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
New:
----
kernel-rt.changes
kernel-rt_debug.changes
kernel-rt_debug.spec
kernel-rt.spec
kernel-rt_timing.changes
kernel-rt_timing.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:14.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:14.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-debug (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.26
-Release: 1
+Release: 8
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -174,6 +181,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-debug debug $(case debug in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -191,7 +199,7 @@
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -559,4 +567,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:14.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:14.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-default (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-default
Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems
Version: 2.6.26
-Release: 1
+Release: 9
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -193,6 +200,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-default default $(case default in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -209,7 +217,7 @@
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -577,4 +585,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:14.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:14.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-dummy (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -16,7 +23,7 @@
Name: kernel-dummy
Summary: Internal dummy package for synchronizing release numbers
Version: 2.6.26
-Release: 1
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: off
@@ -29,7 +36,7 @@
--------
Andreas Gruenbacher <agruen(a)suse.de>
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%install
rm -rf %buildroot
@@ -39,4 +46,3 @@
%files
%defattr(-, root, root)
/etc/dummy
-
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:15.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-kdump (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.26
-Release: 1
+Release: 9
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -171,6 +178,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-kdump kdump $(case kdump in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -190,7 +198,7 @@
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -558,4 +566,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:15.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-pae (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.26
-Release: 1
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -168,6 +175,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-pae pae $(case pae in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -191,7 +199,7 @@
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -559,4 +567,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:15.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-ppc64 (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.26
-Release: 1
+Release: 9
License: GPL v2 or later; LGPL v2.1 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -173,6 +180,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-ppc64 ppc64 $(case ppc64 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -203,7 +211,7 @@
Tom Gall <tom_gall(a)vnet.ibm.com>
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -571,4 +579,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ kernel-ps3.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:16.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:16.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-ps3 (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.26
-Release: 1
+Release: 9
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -171,6 +178,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-ps3 ps3 $(case ps3 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -189,7 +197,7 @@
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -557,4 +565,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ kernel-rt_debug.spec ++++++
++++ 22728 lines (skipped)
kernel-rt.spec: same change
kernel-rt_timing.spec: same change
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:16.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:16.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-s390 (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.26
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -168,6 +175,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-s390 s390 $(case s390 in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -184,7 +192,7 @@
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -552,4 +560,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:17.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-source (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -23,7 +30,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.26
-Release: 1
+Release: 9
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
@@ -71,9 +78,12 @@
Source54: kernel-pae.spec
Source55: kernel-ppc64.spec
Source56: kernel-ps3.spec
-Source57: kernel-s390.spec
-Source58: kernel-vanilla.spec
-Source59: kernel-xen.spec
+Source57: kernel-rt.spec
+Source58: kernel-rt_debug.spec
+Source59: kernel-rt_timing.spec
+Source60: kernel-s390.spec
+Source61: kernel-vanilla.spec
+Source62: kernel-xen.spec
Source100: config.tar.bz2
Source101: patches.arch.tar.bz2
Source102: patches.drivers.tar.bz2
@@ -105,7 +115,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -201,12 +211,8 @@
../../../lib/modules/$krel/source
make clean $MAKE_ARGS
rm -f $o/.config.old
- # Replace absolute with relative paths.
- src="../../../linux-$KERNELRELEASE"
- out="../linux-$KERNELRELEASE-obj/$arch/$flavor"
- sed -e "s,$RPM_BUILD_ROOT,," \
- -e "s,\(^KERNELSRC[ \t]*:=[ \t]*\).*,\1$src," \
- -e "s,\(^KERNELOUTPUT[ \t]*:=[ \t]*\).*,\1$out," \
+ # Replace the absolute with a relative path
+ sed -e "s,/usr/src/linux-$KERNELRELEASE,../../../linux-$KERNELRELEASE,g" \
-i $o/Makefile
done
cd $RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj
@@ -285,4 +291,3 @@
%post -f source-post.sh
%files -f kernel-source.files
-
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:17.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-syms (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -22,7 +29,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.26
-Release: 1
+Release: 9
License: GPL v2 or later
Group: Development/Sources
AutoReqProv: off
@@ -92,7 +99,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
echo "Architecture symbol(s):" %symbols
@@ -143,4 +150,3 @@
/usr/src/linux-*-obj
/boot/symsets-*-*.tar.gz
/lib/modules/*/build
-
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:17.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-vanilla (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.26
-Release: 1
+Release: 9
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -185,6 +192,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-vanilla vanilla $(case vanilla in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -201,7 +209,7 @@
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -569,4 +577,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.Y30938/_old 2008-08-07 01:26:18.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30938/_new 2008-08-07 01:26:18.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package kernel-xen (Version 2.6.26)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -43,7 +50,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.26
-Release: 1
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Url: http://www.kernel.org/
@@ -171,6 +178,7 @@
Obsoletes: adm8211-kmp
Obsoletes: rt2x00-kmp
Obsoletes: rfswitch-kmp
+Obsoletes: uvcvideo-kmp
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,modversions,kabi-checks,install-configs})
%define symbols %(set -- kernel-xen xen $(case xen in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
@@ -190,7 +198,7 @@
-Source Timestamp: 2008-07-17 18:46:12 +0200
+Source Timestamp: 2008-08-06 13:14:35 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.26.tar.bz2 ]; then
@@ -558,4 +566,3 @@
%postun -f postun.sh
%files -f kernel.files
-
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2008-07-17 18:37:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2008-08-06 15:52:01.863746000 +0200
@@ -1 +1 @@
-2008-07-17 18:46:12 +0200
+2008-08-06 13:14:35 +0200
++++++ config.conf ++++++
--- kernel-source/config.conf 2008-07-17 18:37:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/config.conf 2008-08-06 15:52:12.216370000 +0200
@@ -7,8 +7,8 @@
#+IA32 i386/um
+IA32 i386/xen
+IA32 i386/vanilla
-#+IA32 i386/rt
-#+IA32 i386/rt_debug
++IA32 i386/rt
++IA32 i386/rt_debug
+ia64 ia64/default
+ia64 ia64/debug
@@ -19,8 +19,9 @@
+x86_64 x86_64/xen
+x86_64 x86_64/debug
+x86_64 x86_64/vanilla
-#+x86_64 x86_64/rt
-#+x86_64 x86_64/rt_debug
++x86_64 x86_64/rt
++x86_64 x86_64/rt_debug
++x86_64 x86_64/rt_timing
#+alpha alpha/default
++++++ config.tar.bz2 ++++++
++++ 21439 lines of diff (skipped)
++++++ kabi.tar.bz2 ++++++
++++++ modversions ++++++
--- kernel-source/modversions 2008-07-17 18:37:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/modversions 2008-08-06 15:52:12.679906000 +0200
@@ -1,5 +1,7 @@
#! /usr/bin/perl -w
+use File::Basename;
+use File::Path;
use File::Find;
use Getopt::Long;
use strict;
@@ -8,9 +10,40 @@
n => 'normal', t => 'typedef', e => 'enum', s => 'struct', u => 'union'
);
+my %definitions;
+my %override;
+my %override_locally;
+my %locally_unknown;
+my %locally_defined;
+
+sub expand_types($);
+sub expand_types($) {
+ my ($definition) = @_;
+ local ($_, $1, $2);
+
+ my @defn = split ' ', $definition;
+ for (@defn[1..$#defn]) {
+ if (/^(.)#(.*)/) {
+ #print "<<$defn[0] : $_>>\n";
+ next if exists $locally_defined{$_};
+ $locally_defined{$_} = 1;
+
+ if ($locally_unknown{$_}) {
+ print "$_ $symbol_type_name{$1} $2 { UNKNOWN } \n";
+ } else {
+ if (!exists $definitions{$_}) {
+ die "Missing definition of $symbol_type_name{$1} $2\n";
+ }
+ expand_types("$_ $definitions{$_}");
+ }
+ }
+ }
+ print "override " if $override_locally{$defn[0]};
+ print "$definition\n";
+}
+
sub pack_dump($$) {
my ($dir, $ext) = @_;
- my %definitions;
my @files;
$ext = ".symtypes" unless defined $ext;
@@ -27,19 +60,30 @@
while (<FD>) {
chomp;
+ my $override = "";
if (s/^override //) {
- print "override ";
+ $override = $&;
}
+
if (/^(\S)#(\S+)\s*(.*)/) {
my $sym = "$1#$2";
+ my $definition = $3;
if (/^$sym\s+$symbol_type_name{$1}\s+$2\s+{\s+UNKNOWN\s+}\s*$/) {
- $_ = substr($sym, 0, 1) . "##" . substr($sym, 2);
+ $_ = $override . substr($sym, 0, 1) . "##" . substr($sym, 2);
} else {
- if (exists $definitions{$sym} && $definitions{$sym} eq $3) {
- $_ = $sym;
+ if (exists $definitions{$sym} && $definitions{$sym} eq $definition) {
+ if (($override ne "") == (exists $override{$sym})) {
+ next;
+ }
+ $_ = "$override$sym";
} else {
- $definitions{$sym} = $3;
+ $definitions{$sym} = $definition;
+ if ($override eq "") {
+ delete $override{$sym};
+ } else {
+ $override{$sym} = 1;
+ }
}
}
}
@@ -52,7 +96,6 @@
sub unpack_dump($$) {
my ($dir, $ext) = @_;
- my %definitions;
$ext = ".symref" unless defined $ext;
@@ -62,32 +105,42 @@
if (/^\/\* (.*)\.o \*\//) {
close STDOUT;
+ mkpath(dirname("$dir/$1$ext"));
open STDOUT, "> $dir/$1$ext"
or die "$dir/$1$ext: $!\n";
+ %locally_defined = ();
+ %locally_unknown = ();
+ %override_locally = %override;
next;
}
- if (s/^override //) {
- print "override ";
- }
+
+ my $override = /^override\s/;
+
if (/^([^ ])#(#?)([^ ]+) *(.*)$/) {
my $sym = "$1#$3";
if ($4 ne "") {
- unless (/\s+{\s+UNKNOWN\s+}\s*$/) {
+ if (/\s+{\s+UNKNOWN\s+}\s*$/) {
+ $locally_unknown{$sym} = 1;
+ $override_locally{$sym} = $override;
+ } else {
$definitions{$sym} = $4;
+ $locally_unknown{$sym} = 0;
+ $override{$sym} = $override;
+ $override_locally{$sym} = $override;
}
- } elsif ($2 ne "") {
- $_ = "$sym $symbol_type_name{$1} $3 { UNKNOWN } ";
} else {
- $_ = "$sym $definitions{$sym}";
+ $locally_unknown{$sym} = ($2 ne "");
+ $override_locally{$sym} = $override;
}
+ next;
}
- print "$_\n";
+ expand_types($_);
}
}
my ($pack, $unpack, $ext);
-GetOptions("pack" => \$pack, "unpack" => \$unpack, "ext" => \$ext)
+GetOptions("pack" => \$pack, "unpack" => \$unpack, "ext:s" => \$ext)
&& ($pack || $unpack) && @ARGV == 1
or die "USAGE:\t$0 [--ext extension] --pack {dir} > file\n" .
"\t$0 [--ext extension] --unpack {dir} < file\n";
++++++ needed_space_in_mb ++++++
--- kernel-source/needed_space_in_mb 2008-07-19 01:01:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2008-08-06 15:52:26.968611000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.addon.tar.bz2 ++++++
++++++ patches.apparmor.tar.bz2 ++++++
++++ 4388 lines of diff (skipped)
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/acpi_thermal_passive_blacklist.patch new/patches.arch/acpi_thermal_passive_blacklist.patch
--- old/patches.arch/acpi_thermal_passive_blacklist.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/acpi_thermal_passive_blacklist.patch 2008-07-29 17:39:12.000000000 +0200
@@ -0,0 +1,107 @@
+From: Thomas Renninger <trenn(a)suse.de>
+Subject: Avoid critical temp shutdowns on specific ThinkPad T4x(p) and R40
+References: https://bugzilla.novell.com/show_bug.cgi?id=333043
+Patch-Mainline: not yet
+
+---
+ drivers/acpi/thermal.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 73 insertions(+)
+
+Index: linux-2.6.25-SL110_BRANCH/drivers/acpi/thermal.c
+===================================================================
+--- linux-2.6.25-SL110_BRANCH.orig/drivers/acpi/thermal.c
++++ linux-2.6.25-SL110_BRANCH/drivers/acpi/thermal.c
+@@ -42,6 +42,7 @@
+ #include <linux/kmod.h>
+ #include <linux/seq_file.h>
+ #include <linux/reboot.h>
++#include <linux/dmi.h>
+ #include <asm/uaccess.h>
+ #include <linux/thermal.h>
+ #include <acpi/acpi_bus.h>
+@@ -1576,6 +1577,66 @@ static int acpi_thermal_get_info(struct
+ return 0;
+ }
+
++static struct dmi_system_id thermal_psv_dmi_table[] = {
++ {
++ .ident = "IBM ThinkPad T41",
++ .matches = {
++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T41"),
++ },
++ },
++ {
++ .ident = "IBM ThinkPad T42",
++ .matches = {
++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T42"),
++ },
++ },
++ {
++ .ident = "IBM ThinkPad T43",
++ .matches = {
++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T43"),
++ },
++ },
++ {
++ .ident = "IBM ThinkPad T41p",
++ .matches = {
++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T41p"),
++ },
++ },
++ {
++ .ident = "IBM ThinkPad T42p",
++ .matches = {
++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T42p"),
++ },
++ },
++ {
++ .ident = "IBM ThinkPad T43p",
++ .matches = {
++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T43p"),
++ },
++ },
++ {
++ .ident = "IBM ThinkPad R40",
++ .matches = {
++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad R40"),
++ },
++ },
++ {
++ .ident = "IBM ThinkPad R50p",
++ .matches = {
++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad R50p"),
++ },
++ },
++ {},
++};
++
+ static int acpi_thermal_add(struct acpi_device *device)
+ {
+ int result = 0;
+@@ -1606,6 +1667,18 @@ static int acpi_thermal_add(struct acpi_
+ if (result)
+ goto free_memory;
+
++ if (dmi_check_system(thermal_psv_dmi_table)) {
++ if (tz->trips.passive.flags.valid &&
++ tz->trips.passive.temperature > CELSIUS_TO_KELVIN(85)) {
++ printk (KERN_INFO "Adjust passive trip point from %lu"
++ " to %lu\n",
++ KELVIN_TO_CELSIUS(tz->trips.passive.temperature),
++ KELVIN_TO_CELSIUS(tz->trips.passive.temperature - 150));
++ tz->trips.passive.temperature -= 150;
++ acpi_thermal_set_polling(tz, 5);
++ }
++ }
++
+ result = acpi_thermal_add_fs(device);
+ if (result)
+ goto unregister_thermal_zone;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-acpi-reroute-PCI-interrupt-to-legacy-boot-interrupt.patch new/patches.arch/x86-acpi-reroute-PCI-interrupt-to-legacy-boot-interrupt.patch
--- old/patches.arch/x86-acpi-reroute-PCI-interrupt-to-legacy-boot-interrupt.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-acpi-reroute-PCI-interrupt-to-legacy-boot-interrupt.patch 2008-08-01 14:01:16.000000000 +0200
@@ -0,0 +1,153 @@
+From: Stefan Assmann <sassmann(a)suse.de>
+Subject: pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent
+
+Some chipsets (e.g. intel 6700PXH) generate a legacy INTx when the
+IRQ entry in the chipset's IO-APIC is masked (as, e.g. the RT kernel
+does during interrupt handling). On chipsets where this INTx generation
+cannot be disabled, we reroute the valid interrupts to their legacy
+equivalent to get rid of spurious interrupts that might otherwise bring
+down (vital) interrupt lines through spurious interrupt detection in
+note_interrupt().
+
+This patch benefited from discussions with Alexander Graf, Torsten Duwe,
+Ihno Krumreich, Daniel Gollub, Hannes Reinecke. The conclusions we drew
+and the patch itself are the authors' responsibility alone.
+
+Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
+Signed-off-by: Olaf Dabrunz <od(a)suse.de>
+Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
+---
+ drivers/acpi/pci_irq.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/pci/quirks.c | 26 ++++++++++++++++++++++
+ include/linux/pci.h | 6 +++++
+ 3 files changed, 88 insertions(+)
+
+--- a/drivers/acpi/pci_irq.c
++++ b/drivers/acpi/pci_irq.c
+@@ -384,6 +384,27 @@ acpi_pci_free_irq(struct acpi_prt_entry
+ return irq;
+ }
+
++#ifdef CONFIG_X86_IO_APIC
++extern int noioapicquirk;
++
++static int bridge_has_boot_interrupt_variant(struct pci_bus *bus)
++{
++ struct pci_bus *bus_it;
++
++ for (bus_it = bus ; bus_it ; bus_it = bus_it->parent) {
++ if (!bus_it->self)
++ return 0;
++
++ printk(KERN_INFO "vendor=%04x device=%04x\n", bus_it->self->vendor,
++ bus_it->self->device);
++
++ if (bus_it->self->irq_reroute_variant)
++ return bus_it->self->irq_reroute_variant;
++ }
++ return 0;
++}
++#endif /* CONFIG_X86_IO_APIC */
++
+ /*
+ * acpi_pci_irq_lookup
+ * success: return IRQ >= 0
+@@ -413,6 +434,41 @@ acpi_pci_irq_lookup(struct pci_bus *bus,
+ }
+
+ ret = func(entry, triggering, polarity, link);
++
++#ifdef CONFIG_X86_IO_APIC
++ /*
++ * Some chipsets (e.g. intel 6700PXH) generate a legacy INTx when the
++ * IRQ entry in the chipset's IO-APIC is masked (as, e.g. the RT kernel
++ * does during interrupt handling). When this INTx generation cannot be
++ * disabled, we reroute these interrupts to their legacy equivalent to
++ * get rid of spurious interrupts.
++ */
++ if (!noioapicquirk) {
++ switch (bridge_has_boot_interrupt_variant(bus)) {
++ case 0:
++ /* no rerouting necessary */
++ break;
++
++ case INTEL_IRQ_REROUTE_VARIANT:
++ /*
++ * Remap according to INTx routing table in 6700PXH
++ * specs, intel order number 302628-002, section
++ * 2.15.2. Other chipsets (80332, ...) have the same
++ * mapping and are handled here as well.
++ */
++ printk(KERN_INFO "pci irq %d -> rerouted to legacy "
++ "irq %d\n", ret, (ret % 4) + 16);
++ ret = (ret % 4) + 16;
++ break;
++
++ default:
++ printk(KERN_INFO "not rerouting irq %d to legacy irq: "
++ "unknown mapping\n", ret);
++ break;
++ }
++ }
++#endif /* CONFIG_X86_IO_APIC */
++
+ return ret;
+ }
+
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -1365,6 +1365,32 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+
+ #ifdef CONFIG_X86_IO_APIC
+ /*
++ * Boot interrupts on some chipsets cannot be turned off. For these chipsets,
++ * remap the original interrupt in the linux kernel to the boot interrupt, so
++ * that a PCI device's interrupt handler is installed on the boot interrupt
++ * line instead.
++ */
++static void quirk_reroute_to_boot_interrupts_intel(struct pci_dev *dev)
++{
++ if (noioapicquirk)
++ return;
++
++ dev->irq_reroute_variant = INTEL_IRQ_REROUTE_VARIANT;
++
++ printk(KERN_INFO "PCI quirk: reroute interrupts for 0x%04x:0x%04x\n",
++ dev->vendor, dev->device);
++ return;
++}
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80333_0, quirk_reroute_to_boot_interrupts_intel);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80333_1, quirk_reroute_to_boot_interrupts_intel);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, quirk_reroute_to_boot_interrupts_intel);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXH_0, quirk_reroute_to_boot_interrupts_intel);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXH_1, quirk_reroute_to_boot_interrupts_intel);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXHV, quirk_reroute_to_boot_interrupts_intel);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80332_0, quirk_reroute_to_boot_interrupts_intel);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80332_1, quirk_reroute_to_boot_interrupts_intel);
++
++/*
+ * On some chipsets we can disable the generation of legacy INTx boot
+ * interrupts.
+ */
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -117,6 +117,11 @@ enum pci_dev_flags {
+ PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1,
+ };
+
++enum pci_irq_reroute_variant {
++ INTEL_IRQ_REROUTE_VARIANT = 1,
++ MAX_IRQ_REROUTE_VARIANTS = 3
++};
++
+ typedef unsigned short __bitwise pci_bus_flags_t;
+ enum pci_bus_flags {
+ PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1,
+@@ -194,6 +199,7 @@ struct pci_dev {
+ unsigned int no_d1d2:1; /* only allow d0 or d3 */
+ unsigned int block_ucfg_access:1; /* userspace config space access is blocked */
+ unsigned int broken_parity_status:1; /* Device generates false positive parity */
++ unsigned int irq_reroute_variant:2; /* device needs IRQ rerouting variant */
+ unsigned int msi_enabled:1;
+ unsigned int msix_enabled:1;
+ unsigned int is_managed:1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-add-PCI-IDs-for-devices-that-need-boot-irq-quirk.patch new/patches.arch/x86-add-PCI-IDs-for-devices-that-need-boot-irq-quirk.patch
--- old/patches.arch/x86-add-PCI-IDs-for-devices-that-need-boot-irq-quirk.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-add-PCI-IDs-for-devices-that-need-boot-irq-quirk.patch 2008-08-01 14:01:16.000000000 +0200
@@ -0,0 +1,31 @@
+From: Olaf Dabrunz <od(a)suse.de>
+Subject: pci: add PCI IDs for devices that need boot irq quirks
+
+Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
+Signed-off-by: Olaf Dabrunz <od(a)suse.de>
+Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
+---
+ include/linux/pci_ids.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -2235,6 +2235,10 @@
+ #define PCI_DEVICE_ID_INTEL_PXH_0 0x0329
+ #define PCI_DEVICE_ID_INTEL_PXH_1 0x032A
+ #define PCI_DEVICE_ID_INTEL_PXHV 0x032C
++#define PCI_DEVICE_ID_INTEL_80332_0 0x0330
++#define PCI_DEVICE_ID_INTEL_80332_1 0x0332
++#define PCI_DEVICE_ID_INTEL_80333_0 0x0370
++#define PCI_DEVICE_ID_INTEL_80333_1 0x0372
+ #define PCI_DEVICE_ID_INTEL_82375 0x0482
+ #define PCI_DEVICE_ID_INTEL_82424 0x0483
+ #define PCI_DEVICE_ID_INTEL_82378 0x0484
+@@ -2307,6 +2311,7 @@
+ #define PCI_DEVICE_ID_INTEL_ESB_4 0x25a4
+ #define PCI_DEVICE_ID_INTEL_ESB_5 0x25a6
+ #define PCI_DEVICE_ID_INTEL_ESB_9 0x25ab
++#define PCI_DEVICE_ID_INTEL_ESB_10 0x25ac
+ #define PCI_DEVICE_ID_INTEL_82820_HB 0x2500
+ #define PCI_DEVICE_ID_INTEL_82820_UP_HB 0x2501
+ #define PCI_DEVICE_ID_INTEL_82850_HB 0x2530
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch new/patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch
--- old/patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch 2008-08-01 14:01:16.000000000 +0200
@@ -0,0 +1,99 @@
+From: Olaf Dabrunz <od(a)suse.de>
+
+Subject: Disable AMD/ATI legacy boot interrupt generation
+
+Add quirks for several AMD/ATI chipsets to prevent generation of legacy boot
+interrupts.
+
+Signed-off-by: Olaf Dabrunz <od(a)suse.de>
+Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
+---
+ drivers/pci/quirks.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 77 insertions(+)
+
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -1449,6 +1449,83 @@ static void quirk_disable_broadcom_boot_
+ "0x%04x:0x%04x\n", dev->vendor, dev->device);
+ }
+ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000SB, quirk_disable_broadcom_boot_interrupt);
++
++/*
++ * disable boot interrupts on AMD and ATI chipsets
++ */
++#define AMD_813X_MISC 0x40
++#define AMD_813X_NOIOAMODE 1
++
++static void quirk_disable_amd_813x_boot_interrupt(struct pci_dev *dev)
++{
++ u32 pci_config_dword;
++
++ if (noioapicquirk)
++ return;
++
++ pci_read_config_dword(dev, AMD_813X_MISC, &pci_config_dword);
++ pci_config_dword |= AMD_813X_NOIOAMODE;
++ pci_write_config_dword(dev, AMD_813X_MISC, pci_config_dword);
++
++ printk(KERN_INFO "disabled boot interrupts on PCI device "
++ "0x%04x:0x%04x\n", dev->vendor, dev->device);
++}
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_amd_813x_boot_interrupt);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8132_BRIDGE, quirk_disable_amd_813x_boot_interrupt);
++
++#define AMD_8111_PCI_IRQ_ROUTING 0x56
++
++static void quirk_disable_amd_8111_boot_interrupt(struct pci_dev *dev)
++{
++ u16 pci_config_word;
++
++ if (noioapicquirk)
++ return;
++
++ pci_read_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, &pci_config_word);
++ if (!pci_config_word) {
++ printk(KERN_INFO "boot interrupts on PCI device 0x%04x:0x%04x "
++ "already disabled\n",
++ dev->vendor, dev->device);
++ return;
++ }
++ pci_write_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, 0);
++ printk(KERN_INFO "disabled boot interrupts on PCI device "
++ "0x%04x:0x%04x\n", dev->vendor, dev->device);
++}
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS, quirk_disable_amd_8111_boot_interrupt);
++
++/*
++ * disable PCI boot interrupt mapping to PIC / first IO-APIC on SB700S
++ */
++#define AMD_SB700S_MAP_REG 0x64
++#define AMD_SB700S_MAP_ENABLE (1<<0)
++#define AMD_SB700S_IRQ_IDX 0xC00
++#define AMD_SB700S_IRQ_DATA 0xC01
++
++static void quirk_disable_amd_sb700s_boot_interrupt(struct pci_dev *dev)
++{
++ u32 pci_config_dword;
++ int i, irqs[] = {0x0, 0x1, 0x2, 0x3, 0x4, 0x9, 0xa, 0xb, 0xc};
++
++ if (noioapicquirk)
++ return;
++
++ pci_read_config_dword(dev, AMD_SB700S_MAP_REG, &pci_config_dword);
++ pci_write_config_dword(dev, AMD_SB700S_MAP_REG, pci_config_dword |
++ AMD_SB700S_MAP_ENABLE);
++
++ for (i = 0; i < ARRAY_SIZE(irqs); i++) {
++ outb(irqs[i], AMD_SB700S_IRQ_IDX);
++ outb(0x00, AMD_SB700S_IRQ_DATA);
++ }
++
++ pci_write_config_dword(dev, AMD_SB700S_MAP_REG, pci_config_dword);
++
++ printk(KERN_INFO "disabled boot interrupts on PCI device "
++ "0x%04x:0x%04x\n", dev->vendor, dev->device);
++}
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, quirk_disable_amd_sb700s_boot_interrupt);
+ #endif /* CONFIG_X86_IO_APIC */
+
+ /*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch new/patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch
--- old/patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch 2008-08-01 14:01:16.000000000 +0200
@@ -0,0 +1,51 @@
+From: Olaf Dabrunz <od(a)suse.de>
+
+Subject: Add quirk to disable boot interrupt generation on broadcom HT1000
+
+Signed-off-by: Olaf Dabrunz <od(a)suse.de>
+Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
+---
+ drivers/pci/quirks.c | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -1417,6 +1417,38 @@ static void quirk_disable_intel_boot_int
+ dev->vendor, dev->device);
+ }
+ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_10, quirk_disable_intel_boot_interrupt);
++
++/*
++ * disable boot interrupts on HT-1000
++ */
++#define BC_HT1000_FEATURE_REG 0x64
++#define BC_HT1000_PIC_REGS_ENABLE (1<<0)
++#define BC_HT1000_MAP_IDX 0xC00
++#define BC_HT1000_MAP_DATA 0xC01
++
++static void quirk_disable_broadcom_boot_interrupt(struct pci_dev *dev)
++{
++ u32 pci_config_dword;
++ u8 irq;
++
++ if (noioapicquirk)
++ return;
++
++ pci_read_config_dword(dev, BC_HT1000_FEATURE_REG, &pci_config_dword);
++ pci_write_config_dword(dev, BC_HT1000_FEATURE_REG, pci_config_dword |
++ BC_HT1000_PIC_REGS_ENABLE);
++
++ for (irq = 0x10; irq < 0x10 + 32; irq++) {
++ outb(irq, BC_HT1000_MAP_IDX);
++ outb(0x00, BC_HT1000_MAP_DATA);
++ }
++
++ pci_write_config_dword(dev, BC_HT1000_FEATURE_REG, pci_config_dword);
++
++ printk(KERN_INFO "disabled boot interrupts on PCI device"
++ "0x%04x:0x%04x\n", dev->vendor, dev->device);
++}
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000SB, quirk_disable_broadcom_boot_interrupt);
+ #endif /* CONFIG_X86_IO_APIC */
+
+ /*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-disable-intel-boot-interrupt-generation.patch new/patches.arch/x86-disable-intel-boot-interrupt-generation.patch
--- old/patches.arch/x86-disable-intel-boot-interrupt-generation.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-disable-intel-boot-interrupt-generation.patch 2008-08-01 14:01:16.000000000 +0200
@@ -0,0 +1,56 @@
+From: Stefan Assmann <sassmann(a)suse.de>
+Subject: pci: add quirk to disable boot interrupt generation on intel 6300ESB
+
+Add a quirk to disable legacy boot interrupt generation on intel devices
+that support disabling it.
+
+This patch benefited from discussions with Alexander Graf, Torsten Duwe,
+Ihno Krumreich, Daniel Gollub, Hannes Reinecke. The conclusions we drew
+and the patch itself are the authors' responsibility alone.
+
+Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
+Signed-off-by: Olaf Dabrunz <od(a)suse.de>
+Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
+---
+ drivers/pci/quirks.c | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -1363,6 +1363,36 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x260a, quirk_intel_pcie_pm);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x260b, quirk_intel_pcie_pm);
+
++#ifdef CONFIG_X86_IO_APIC
++/*
++ * On some chipsets we can disable the generation of legacy INTx boot
++ * interrupts.
++ */
++
++/*
++ * IO-APIC1 on 6300ESB generates boot interrupts, see intel order no
++ * 300641-004US, section 5.7.3.
++ */
++#define INTEL_6300_IOAPIC_ABAR 0x40
++#define INTEL_6300_DISABLE_BOOT_IRQ (1<<14)
++
++static void quirk_disable_intel_boot_interrupt(struct pci_dev *dev)
++{
++ u16 pci_config_word;
++
++ if (noioapicquirk)
++ return;
++
++ pci_read_config_word(dev, INTEL_6300_IOAPIC_ABAR, &pci_config_word);
++ pci_config_word |= INTEL_6300_DISABLE_BOOT_IRQ;
++ pci_write_config_word(dev, INTEL_6300_IOAPIC_ABAR, pci_config_word);
++
++ printk(KERN_INFO "disabled boot interrupt on device 0x%04x:0x%04x\n",
++ dev->vendor, dev->device);
++}
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_10, quirk_disable_intel_boot_interrupt);
++#endif /* CONFIG_X86_IO_APIC */
++
+ /*
+ * Toshiba TC86C001 IDE controller reports the standard 8-byte BAR0 size
+ * but the PIO transfers won't work if BAR0 falls at the odd 8 bytes.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch new/patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch
--- old/patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch 2008-08-01 14:01:16.000000000 +0200
@@ -0,0 +1,123 @@
+From: Stefan Assmann <sassmann(a)suse.de>
+Subject: Introduce config option for pci reroute quirks
+
+The config option X86_REROUTE_FOR_BROKEN_BOOT_IRQS is introduced to
+enable (or disable) the redirection of the interrupt handler to the boot
+interrupt line by default. Depending on the existence of interrupt
+masking / threaded interrupt handling in the kernel (vanilla, rt, ...)
+and the maturity of the rerouting patch, users can enable or disable the
+redirection by default.
+
+This means that the reroute quirk can be applied to any kernel without
+changing it.
+
+Interrupt sharing could be increased if this option is enabled. However this
+option is vital for threaded interrupt handling, as done by the RT kernel.
+It should simplify the consolidation with the RT kernel.
+
+The option can be overridden by either pci=ioapicreroute or
+pci=noioapicreroute.
+
+Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
+Signed-off-by: Olaf Dabrunz <od(a)suse.de>
+---
+ Documentation/kernel-parameters.txt | 4 ++++
+ arch/x86/Kconfig | 24 ++++++++++++++++++++++++
+ arch/x86/pci/common.c | 8 ++++++++
+ drivers/pci/quirks.c | 2 +-
+ include/asm-x86/pci.h | 2 +-
+ 5 files changed, 38 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/pci/common.c
++++ b/arch/x86/pci/common.c
+@@ -23,7 +23,11 @@ unsigned int pci_probe = PCI_PROBE_BIOS
+ static int pci_bf_sort;
+ int pci_routeirq;
+ int noioapicquirk;
++#ifdef CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
++int noioapicreroute = 0;
++#else
+ int noioapicreroute = 1;
++#endif
+ int pcibios_last_bus = -1;
+ unsigned long pirq_table_addr;
+ struct pci_bus *pci_root_bus;
+@@ -504,6 +508,10 @@ char * __devinit pcibios_setup(char *st
+ if (noioapicreroute != -1)
+ noioapicreroute = 0;
+ return NULL;
++ } else if (!strcmp(str, "noioapicreroute")) {
++ if (noioapicreroute != -1)
++ noioapicreroute = 1;
++ return NULL;
+ }
+ return str;
+ }
+--- a/include/asm-x86/pci.h
++++ b/include/asm-x86/pci.h
+@@ -19,7 +19,7 @@ struct pci_sysdata {
+ };
+
+ extern int noioapicquirk;
+-extern int ioapicreroute;
++extern int noioapicreroute;
+
+ /* scan a bus after allocating a pci_sysdata for it */
+ extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -1372,7 +1372,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+ */
+ static void quirk_reroute_to_boot_interrupts_intel(struct pci_dev *dev)
+ {
+- if (noioapicquirk)
++ if (noioapicquirk || noioapicreroute)
+ return;
+
+ dev->irq_reroute_variant = INTEL_IRQ_REROUTE_VARIANT;
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -1491,6 +1491,10 @@ and is between 256 and 4096 characters.
+ primary IO-APIC for bridges that cannot disable
+ boot IRQs. This fixes a source of spurious IRQs
+ when the system masks IRQs.
++ noioapicreroute [APIC] Disable workaround that uses the
++ boot IRQ equivalent of an IRQ that connects to
++ a chipset where boot IRQs cannot be disabled.
++ The opposite of ioapicreroute.
+ biosirq [X86-32] Use PCI BIOS calls to get the interrupt
+ routing table. These calls are known to be buggy
+ on several machines and they hang the machine
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -596,6 +596,30 @@ config SCHED_MC
+
+ source "kernel/Kconfig.preempt"
+
++config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
++ bool "Reroute for broken boot IRQs"
++ default n
++ depends on X86_IO_APIC
++ help
++ This option enables a workaround that fixes a source of
++ spurious interrupts. This is recommended when threaded
++ interrupt handling is used on systems where the generation of
++ superfluous "boot interrupts" cannot be disabled.
++
++ Some chipsets generate a legacy INTx "boot IRQ" when the IRQ
++ entry in the chipset's IO-APIC is masked (as, e.g. the RT
++ kernel does during interrupt handling). On chipsets where this
++ boot IRQ generation cannot be disabled, this workaround keeps
++ the original IRQ line masked so that only the equivalent "boot
++ IRQ" is delivered to the CPUs. The workaround also tells the
++ kernel to set up the IRQ handler on the boot IRQ line. In this
++ way only one interrupt is delivered to the kernel. Otherwise
++ the spurious second interrupt may cause the kernel to bring
++ down (vital) interrupt lines.
++
++ Only affects "broken" chipsets. Interrupt sharing may be
++ increased on these systems.
++
+ config X86_UP_APIC
+ bool "Local APIC support on uniprocessors"
+ depends on X86_32 && !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-introduce-pci-ioapicreroute-kernel-cmdline.patch new/patches.arch/x86-introduce-pci-ioapicreroute-kernel-cmdline.patch
--- old/patches.arch/x86-introduce-pci-ioapicreroute-kernel-cmdline.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-introduce-pci-ioapicreroute-kernel-cmdline.patch 2008-08-01 14:01:16.000000000 +0200
@@ -0,0 +1,77 @@
+From: Stefan Assmann <sassmann(a)suse.de>
+Subject: x86, pci: introduce pci=ioapicreroute kernel cmdline option
+
+Introduce pci=ioapicreroute kernel cmdline option to enable rerouting of boot
+interrupts to the primary io-apic.
+
+Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
+Signed-off-by: Olaf Dabrunz <od(a)suse.de>
+Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
+---
+ Documentation/kernel-parameters.txt | 4 ++++
+ arch/x86/pci/common.c | 5 +++++
+ include/asm-x86/io_apic.h | 4 ++++
+ include/asm-x86/pci.h | 1 +
+ 4 files changed, 14 insertions(+)
+
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -1487,6 +1487,10 @@ and is between 256 and 4096 characters.
+ noioapicquirk [APIC] Disable all boot interrupt quirks.
+ Safety option to keep boot IRQs enabled. This
+ should never be necessary.
++ ioapicreroute [APIC] Enable rerouting of boot IRQs to the
++ primary IO-APIC for bridges that cannot disable
++ boot IRQs. This fixes a source of spurious IRQs
++ when the system masks IRQs.
+ biosirq [X86-32] Use PCI BIOS calls to get the interrupt
+ routing table. These calls are known to be buggy
+ on several machines and they hang the machine
+--- a/arch/x86/pci/common.c
++++ b/arch/x86/pci/common.c
+@@ -23,6 +23,7 @@ unsigned int pci_probe = PCI_PROBE_BIOS
+ static int pci_bf_sort;
+ int pci_routeirq;
+ int noioapicquirk;
++int noioapicreroute = 1;
+ int pcibios_last_bus = -1;
+ unsigned long pirq_table_addr;
+ struct pci_bus *pci_root_bus;
+@@ -499,6 +500,10 @@ char * __devinit pcibios_setup(char *st
+ } else if (!strcmp(str, "noioapicquirk")) {
+ noioapicquirk = 1;
+ return NULL;
++ } else if (!strcmp(str, "ioapicreroute")) {
++ if (noioapicreroute != -1)
++ noioapicreroute = 0;
++ return NULL;
+ }
+ return str;
+ }
+--- a/include/asm-x86/pci.h
++++ b/include/asm-x86/pci.h
+@@ -19,6 +19,7 @@ struct pci_sysdata {
+ };
+
+ extern int noioapicquirk;
++extern int ioapicreroute;
+
+ /* scan a bus after allocating a pci_sysdata for it */
+ extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
+--- a/include/asm-x86/io_apic.h
++++ b/include/asm-x86/io_apic.h
+@@ -140,10 +140,14 @@ extern int skip_ioapic_setup;
+ /* 1 if "noapic" boot option passed */
+ extern int noioapicquirk;
+
++/* -1 if "noapic" boot option passed */
++extern int noioapicreroute;
++
+ static inline void disable_ioapic_setup(void)
+ {
+ #ifdef CONFIG_PCI
+ noioapicquirk = 1;
++ noioapicreroute = -1;
+ #endif
+ skip_ioapic_setup = 1;
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-introduce-pci-noioapicquirk-kernel-cmdline.patch new/patches.arch/x86-introduce-pci-noioapicquirk-kernel-cmdline.patch
--- old/patches.arch/x86-introduce-pci-noioapicquirk-kernel-cmdline.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/x86-introduce-pci-noioapicquirk-kernel-cmdline.patch 2008-08-01 14:01:16.000000000 +0200
@@ -0,0 +1,76 @@
+From: Stefan Assmann <sassmann(a)suse.de>
+Subject: x86, pci: introduce pci=noioapicquirk kernel cmdline option
+
+Introduce pci=noioapicquirk kernel cmdline option to disable all boot
+interrupt quirks
+
+Signed-off-by: Stefan Assmann <sassmann(a)suse.de>
+Signed-off-by: Olaf Dabrunz <od(a)suse.de>
+Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
+---
+ Documentation/kernel-parameters.txt | 3 +++
+ arch/x86/pci/common.c | 4 ++++
+ include/asm-x86/io_apic.h | 6 ++++++
+ include/asm-x86/pci.h | 2 ++
+ 4 files changed, 15 insertions(+)
+
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -1484,6 +1484,9 @@ and is between 256 and 4096 characters.
+ nomsi [MSI] If the PCI_MSI kernel config parameter is
+ enabled, this kernel boot option can be used to
+ disable the use of MSI interrupts system-wide.
++ noioapicquirk [APIC] Disable all boot interrupt quirks.
++ Safety option to keep boot IRQs enabled. This
++ should never be necessary.
+ biosirq [X86-32] Use PCI BIOS calls to get the interrupt
+ routing table. These calls are known to be buggy
+ on several machines and they hang the machine
+--- a/arch/x86/pci/common.c
++++ b/arch/x86/pci/common.c
+@@ -22,6 +22,7 @@ unsigned int pci_probe = PCI_PROBE_BIOS
+
+ static int pci_bf_sort;
+ int pci_routeirq;
++int noioapicquirk;
+ int pcibios_last_bus = -1;
+ unsigned long pirq_table_addr;
+ struct pci_bus *pci_root_bus;
+@@ -495,6 +496,9 @@ char * __devinit pcibios_setup(char *st
+ } else if (!strcmp(str, "skip_isa_align")) {
+ pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;
+ return NULL;
++ } else if (!strcmp(str, "noioapicquirk")) {
++ noioapicquirk = 1;
++ return NULL;
+ }
+ return str;
+ }
+--- a/include/asm-x86/io_apic.h
++++ b/include/asm-x86/io_apic.h
+@@ -137,8 +137,14 @@ extern int sis_apic_bug;
+ /* 1 if "noapic" boot option passed */
+ extern int skip_ioapic_setup;
+
++/* 1 if "noapic" boot option passed */
++extern int noioapicquirk;
++
+ static inline void disable_ioapic_setup(void)
+ {
++#ifdef CONFIG_PCI
++ noioapicquirk = 1;
++#endif
+ skip_ioapic_setup = 1;
+ }
+
+--- a/include/asm-x86/pci.h
++++ b/include/asm-x86/pci.h
+@@ -18,6 +18,8 @@ struct pci_sysdata {
+ #endif
+ };
+
++extern int noioapicquirk;
++
+ /* scan a bus after allocating a pci_sysdata for it */
+ extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
+ int node);
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_use_acpi_exception.patch new/patches.fixes/acpi_use_acpi_exception.patch
--- old/patches.fixes/acpi_use_acpi_exception.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/acpi_use_acpi_exception.patch 2008-07-29 17:39:12.000000000 +0200
@@ -0,0 +1,72 @@
+From: Thomas Renninger <trenn(a)suse.de>
+Subject: ACPI dock/bay: Use ACPI_EXCEPTION instead of printk(KERN_ERR
+Patch-Mainline: not yet
+
+Getting this error:
+ACPI: \_SB_.PCI0.IDE1.PRI_.MAST: found ejectable bay
+ACPI: \_SB_.PCI0.IDE1.PRI_.MAST: Adding notify handler
+ACPI: Error installing bay notify handler
+
+there could be various reasons why installing the notify handler failed.
+It is expected that the dock driver already has installed the notify
+handler for this device, but this is not clear.
+printk suppresses this information.
+The return value of the previous called and failed acpica function
+holds this information and should be printed using ACPI_EXCEPTION which
+is designed for printing error messages on failed acpica calls.
+
+IMO this should get documented in Documentation/acpi/..., but I
+was unsure whether it's worth to start a acpi_programming_rules.txt
+(couldn't think of much more ading there for now) or
+whether it's worth to add print_acpica_errors_in_kernel_drivers.txt
+(or similar).
+
+diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
+index 61b6c5b..c8cc7dc 100644
+--- a/drivers/acpi/bay.c
++++ b/drivers/acpi/bay.c
+@@ -305,7 +305,8 @@ static int bay_add(acpi_handle handle, int id)
+ status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
+ bay_notify, new_bay);
+ if (ACPI_FAILURE(status)) {
+- printk(KERN_INFO PREFIX "Error installing bay notify handler\n");
++ ACPI_EXCEPTION((AE_INFO, status,
++ "Error installing bay notify handler\n"));
+ platform_device_unregister(new_bay->pdev);
+ goto bay_add_err;
+ }
+diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
+index bb7c51f..875a1a1 100644
+--- a/drivers/acpi/dock.c
++++ b/drivers/acpi/dock.c
+@@ -415,8 +415,8 @@ static void handle_dock(struct dock_station *ds, int dock)
+ arg.integer.value = dock;
+ status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer);
+ if (ACPI_FAILURE(status))
+- printk(KERN_ERR PREFIX "%s - failed to execute _DCK\n",
+- (char *)name_buffer.pointer);
++ ACPI_EXCEPTION((AE_INFO, status, "%s - failed to execute"
++ " _DCK\n", (char *)name_buffer.pointer));
+ kfree(buffer.pointer);
+ kfree(name_buffer.pointer);
+ }
+@@ -829,7 +829,8 @@ static int dock_add(acpi_handle handle)
+ dock_notify, dock_station);
+
+ if (ACPI_FAILURE(status)) {
+- printk(KERN_ERR PREFIX "Error installing notify handler\n");
++ ACPI_EXCEPTION((AE_INFO, status, "Error installing notify"
++ " handler\n"));
+ ret = -ENODEV;
+ goto dock_add_err;
+ }
+@@ -872,7 +873,8 @@ static int dock_remove(void)
+ ACPI_SYSTEM_NOTIFY,
+ dock_notify);
+ if (ACPI_FAILURE(status))
+- printk(KERN_ERR "Error removing notify handler\n");
++ ACPI_EXCEPTION((AE_INFO, status,
++ "Error removing notify handler\n"));
+
+ /* cleanup sysfs */
+ device_remove_file(&dock_device->dev, &dev_attr_docked);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ath5k-fix-memory-corruption.patch new/patches.fixes/ath5k-fix-memory-corruption.patch
--- old/patches.fixes/ath5k-fix-memory-corruption.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/ath5k-fix-memory-corruption.patch 2008-08-05 11:48:03.000000000 +0200
@@ -0,0 +1,152 @@
+From 3a0f2c871849f23c1070965bf94dec3f9c0b479d Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jirislaby(a)gmail.com>
+Date: Tue, 15 Jul 2008 17:44:18 +0200
+Subject: [PATCH] Ath5k: fix memory corruption
+Patch-mainline: 2.6.27
+References: bnc#414635
+
+When signal is noisy, hardware can use all RX buffers and since the last
+entry in the list is self-linked, it overwrites the entry until we link
+new buffers.
+
+Ensure that we don't free this last one until we are 100% sure that it
+is not used by the hardware anymore to not cause memory curruption as
+can be seen below.
+
+This is done by checking next buffer in the list. Even after that we
+know that the hardware refetched the new link and proceeded further
+(the next buffer is ready) we can finally free the overwritten buffer.
+
+We discard it since the status in its descriptor is overwritten (OR-ed
+by new status) too.
+
+=============================================================================
+BUG kmalloc-4096: Poison overwritten
+-----------------------------------------------------------------------------
+
+INFO: 0xffff810067419060-0xffff810067419667. First byte 0x8 instead of 0x6b
+INFO: Allocated in dev_alloc_skb+0x18/0x30 age=1118 cpu=1 pid=0
+INFO: Freed in skb_release_data+0x85/0xd0 age=1105 cpu=1 pid=3718
+INFO: Slab 0xffffe200019d0600 objects=7 used=0 fp=0xffff810067419048 flags=0x40000000000020c3
+INFO: Object 0xffff810067419048 @offset=4168 fp=0xffff81006741c120
+
+Bytes b4 0xffff810067419038: 4f 0b 02 00 01 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a O.......ZZZZZZZZ
+ Object 0xffff810067419048: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
+ Object 0xffff810067419058: 6b 6b 6b 6b 6b 6b 6b 6b 08 42 30 00 00 0b 6b 80 kkkkkkkk.B0...k.
+ Object 0xffff810067419068: f0 5d 00 4f 62 08 a3 64 00 0c 42 16 52 e4 f0 5a 360].Ob.243d..B.R344360Z
+ Object 0xffff810067419078: 68 81 00 00 7b a5 b4 be 7d 3b 8f 53 cd d5 de 12 h...{245264276};.S315325336.
+ Object 0xffff810067419088: 96 10 0b 89 48 54 23 41 0f 4e 2d b9 37 c3 cb 29 ....HT#A.N-2717303313)
+ Object 0xffff810067419098: d1 e0 de 14 8a 57 2a cc 3b 44 0d 78 7a 19 12 15 321340336..W*314;D.xz...
+ Object 0xffff8100674190a8: a9 ec d4 35 a8 10 ec 8c 40 a7 06 0a 51 a7 48 bb 2513543245250.354.@247..Q247H273
+ Object 0xffff8100674190b8: 3e cf a1 c7 38 60 63 3f 51 15 c7 20 eb ba 65 30 >ϡ3078`c?Q.307.353272e0
+ Redzone 0xffff81006741a048: bb bb bb bb bb bb bb bb 273273273273273273273273
+ Padding 0xffff81006741a088: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ
+Pid: 3297, comm: ath5k_pci Not tainted 2.6.26-rc8-mm1_64 #427
+
+Call Trace:
+ [<ffffffff802a7306>] print_trailer+0xf6/0x150
+ [<ffffffff802a7485>] check_bytes_and_report+0x125/0x180
+ [<ffffffff802a75dc>] check_object+0xac/0x260
+ [<ffffffff802a9308>] __slab_alloc+0x368/0x6d0
+ [<ffffffff80544f82>] ? wireless_send_event+0x142/0x310
+ [<ffffffff804b1bd4>] ? __alloc_skb+0x44/0x150
+ [<ffffffff80544f82>] ? wireless_send_event+0x142/0x310
+ [<ffffffff802aa853>] __kmalloc_track_caller+0xc3/0xf0
+ [<ffffffff804b1bfe>] __alloc_skb+0x6e/0x150
+[... stack snipped]
+
+FIX kmalloc-4096: Restoring 0xffff810067419060-0xffff810067419667=0x6b
+
+FIX kmalloc-4096: Marking all objects used
+
+Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
+Acked-by: Nick Kossifidis <mickflemm(a)gmail.com>
+Cc: Luis R. Rodriguez <mcgrof(a)gmail.com>
+Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
+---
+ drivers/net/wireless/ath5k/base.c | 32 +++++++++++++++++++++++++-------
+ drivers/net/wireless/ath5k/base.h | 2 +-
+ 2 files changed, 26 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
+index d9769c5..ed51c4a 100644
+--- a/drivers/net/wireless/ath5k/base.c
++++ b/drivers/net/wireless/ath5k/base.c
+@@ -1682,20 +1682,21 @@ ath5k_tasklet_rx(unsigned long data)
+ struct ath5k_rx_status rs = {};
+ struct sk_buff *skb;
+ struct ath5k_softc *sc = (void *)data;
+- struct ath5k_buf *bf;
++ struct ath5k_buf *bf, *bf_last;
+ struct ath5k_desc *ds;
+ int ret;
+ int hdrlen;
+ int pad;
+
+ spin_lock(&sc->rxbuflock);
++ if (list_empty(&sc->rxbuf)) {
++ ATH5K_WARN(sc, "empty rx buf pool\n");
++ goto unlock;
++ }
++ bf_last = list_entry(sc->rxbuf.prev, struct ath5k_buf, list);
+ do {
+ rxs.flag = 0;
+
+- if (unlikely(list_empty(&sc->rxbuf))) {
+- ATH5K_WARN(sc, "empty rx buf pool\n");
+- break;
+- }
+ bf = list_first_entry(&sc->rxbuf, struct ath5k_buf, list);
+ BUG_ON(bf->skb == NULL);
+ skb = bf->skb;
+@@ -1705,8 +1706,24 @@ ath5k_tasklet_rx(unsigned long data)
+ pci_dma_sync_single_for_cpu(sc->pdev, sc->desc_daddr,
+ sc->desc_len, PCI_DMA_FROMDEVICE);
+
+- if (unlikely(ds->ds_link == bf->daddr)) /* this is the end */
+- break;
++ /*
++ * last buffer must not be freed to ensure proper hardware
++ * function. When the hardware finishes also a packet next to
++ * it, we are sure, it doesn't use it anymore and we can go on.
++ */
++ if (bf_last == bf)
++ bf->flags |= 1;
++ if (bf->flags) {
++ struct ath5k_buf *bf_next = list_entry(bf->list.next,
++ struct ath5k_buf, list);
++ ret = sc->ah->ah_proc_rx_desc(sc->ah, bf_next->desc,
++ &rs);
++ if (ret)
++ break;
++ bf->flags &= ~1;
++ /* skip the overwritten one (even status is martian) */
++ goto next;
++ }
+
+ ret = sc->ah->ah_proc_rx_desc(sc->ah, ds, &rs);
+ if (unlikely(ret == -EINPROGRESS))
+@@ -1816,6 +1833,7 @@ accept:
+ next:
+ list_move_tail(&bf->list, &sc->rxbuf);
+ } while (ath5k_rxbuf_setup(sc, bf) == 0);
++unlock:
+ spin_unlock(&sc->rxbuflock);
+ }
+
+diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h
+index 47f414b..d7e03e6 100644
+--- a/drivers/net/wireless/ath5k/base.h
++++ b/drivers/net/wireless/ath5k/base.h
+@@ -56,7 +56,7 @@
+
+ struct ath5k_buf {
+ struct list_head list;
+- unsigned int flags; /* tx descriptor flags */
++ unsigned int flags; /* rx descriptor flags */
+ struct ath5k_desc *desc; /* virtual addr of desc */
+ dma_addr_t daddr; /* physical addr of desc */
+ struct sk_buff *skb; /* skbuff for buf */
+--
+1.5.6.2
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ath5k-kill-tasklets-on-shutdown.patch new/patches.fixes/ath5k-kill-tasklets-on-shutdown.patch
--- old/patches.fixes/ath5k-kill-tasklets-on-shutdown.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/ath5k-kill-tasklets-on-shutdown.patch 2008-08-05 11:48:03.000000000 +0200
@@ -0,0 +1,35 @@
+From 10488f8ad62be3b860bad74e60b4fe6ab87aece3 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jirislaby(a)gmail.com>
+Date: Tue, 15 Jul 2008 17:44:19 +0200
+Subject: [PATCH] Ath5k: kill tasklets on shutdown
+Patch-mainline: 2.6.27
+References: bnc#414638
+
+Don't forget to kill tasklets on stop to not panic if they
+fire after freeing some structures.
+
+Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
+Acked-by: Nick Kossifidis <mickflemm(a)gmail.com>
+Cc: Luis R. Rodriguez <mcgrof(a)gmail.com>
+Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
+---
+ drivers/net/wireless/ath5k/base.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
+index ed51c4a..c5bf8a2 100644
+--- a/drivers/net/wireless/ath5k/base.c
++++ b/drivers/net/wireless/ath5k/base.c
+@@ -2342,6 +2342,9 @@ ath5k_stop_hw(struct ath5k_softc *sc)
+ mutex_unlock(&sc->lock);
+
+ del_timer_sync(&sc->calib_tim);
++ tasklet_kill(&sc->rxtq);
++ tasklet_kill(&sc->txtq);
++ tasklet_kill(&sc->restq);
+
+ return ret;
+ }
+--
+1.5.6.2
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/reiserfs-commit-ids-unsigned-ints new/patches.fixes/reiserfs-commit-ids-unsigned-ints
--- old/patches.fixes/reiserfs-commit-ids-unsigned-ints 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/reiserfs-commit-ids-unsigned-ints 2008-08-05 21:55:56.000000000 +0200
@@ -0,0 +1,274 @@
+From: Jeff Mahoney <jeffm(a)suse.com>
+Subject: [PATCH] reiserfs: audit transaction ids to always be unsigned ints
+References: bnc#410847
+
+ This patch fixes up the reiserfs code such that transaction ids are
+ always unsigned ints. In places they can currently be signed ints or
+ unsigned longs.
+
+ The former just causes an annoying clm-2200 warning and may join a
+ transaction when it should wait.
+
+ The latter is just for correctness since the disk format uses a 32-bit
+ transaction id. There aren't any runtime problems that result from it
+ not wrapping at the correct location since the value is truncated
+ correctly even on big endian systems. The 0 value might make it to disk,
+ but the mount-time checks will bump it to 10 itself.
+
+Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
+
+---
+ fs/reiserfs/journal.c | 44 ++++++++++++++++++++---------------------
+ fs/reiserfs/procfs.c | 4 +--
+ include/linux/reiserfs_fs.h | 2 -
+ include/linux/reiserfs_fs_i.h | 2 -
+ include/linux/reiserfs_fs_sb.h | 8 +++----
+ 5 files changed, 30 insertions(+), 30 deletions(-)
+
+--- a/fs/reiserfs/journal.c
++++ b/fs/reiserfs/journal.c
+@@ -576,7 +576,7 @@ static inline void put_journal_list(stru
+ struct reiserfs_journal_list *jl)
+ {
+ if (jl->j_refcount < 1) {
+- reiserfs_panic(s, "trans id %lu, refcount at %d",
++ reiserfs_panic(s, "trans id %u, refcount at %d",
+ jl->j_trans_id, jl->j_refcount);
+ }
+ if (--jl->j_refcount == 0)
+@@ -601,7 +601,7 @@ static void cleanup_freed_for_journal_li
+ }
+
+ static int journal_list_still_alive(struct super_block *s,
+- unsigned long trans_id)
++ unsigned int trans_id)
+ {
+ struct reiserfs_journal *journal = SB_JOURNAL(s);
+ struct list_head *entry = &journal->j_journal_list;
+@@ -935,9 +935,9 @@ static int flush_older_commits(struct su
+ struct reiserfs_journal_list *other_jl;
+ struct reiserfs_journal_list *first_jl;
+ struct list_head *entry;
+- unsigned long trans_id = jl->j_trans_id;
+- unsigned long other_trans_id;
+- unsigned long first_trans_id;
++ unsigned int trans_id = jl->j_trans_id;
++ unsigned int other_trans_id;
++ unsigned int first_trans_id;
+
+ find_first:
+ /*
+@@ -1016,7 +1016,7 @@ static int flush_commit_list(struct supe
+ int i;
+ b_blocknr_t bn;
+ struct buffer_head *tbh = NULL;
+- unsigned long trans_id = jl->j_trans_id;
++ unsigned int trans_id = jl->j_trans_id;
+ struct reiserfs_journal *journal = SB_JOURNAL(s);
+ int barrier = 0;
+ int retval = 0;
+@@ -1277,7 +1277,7 @@ static void remove_all_from_journal_list
+ */
+ static int _update_journal_header_block(struct super_block *p_s_sb,
+ unsigned long offset,
+- unsigned long trans_id)
++ unsigned int trans_id)
+ {
+ struct reiserfs_journal_header *jh;
+ struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+@@ -1331,7 +1331,7 @@ static int _update_journal_header_block(
+
+ static int update_journal_header_block(struct super_block *p_s_sb,
+ unsigned long offset,
+- unsigned long trans_id)
++ unsigned int trans_id)
+ {
+ return _update_journal_header_block(p_s_sb, offset, trans_id);
+ }
+@@ -1346,7 +1346,7 @@ static int flush_older_journal_lists(str
+ struct list_head *entry;
+ struct reiserfs_journal_list *other_jl;
+ struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+- unsigned long trans_id = jl->j_trans_id;
++ unsigned int trans_id = jl->j_trans_id;
+
+ /* we know we are the only ones flushing things, no extra race
+ * protection is required.
+@@ -1760,13 +1760,13 @@ static int dirty_one_transaction(struct
+ static int kupdate_transactions(struct super_block *s,
+ struct reiserfs_journal_list *jl,
+ struct reiserfs_journal_list **next_jl,
+- unsigned long *next_trans_id,
++ unsigned int *next_trans_id,
+ int num_blocks, int num_trans)
+ {
+ int ret = 0;
+ int written = 0;
+ int transactions_flushed = 0;
+- unsigned long orig_trans_id = jl->j_trans_id;
++ unsigned int orig_trans_id = jl->j_trans_id;
+ struct buffer_chunk chunk;
+ struct list_head *entry;
+ struct reiserfs_journal *journal = SB_JOURNAL(s);
+@@ -1835,7 +1835,7 @@ static int flush_used_journal_lists(stru
+ int limit = 256;
+ struct reiserfs_journal_list *tjl;
+ struct reiserfs_journal_list *flush_jl;
+- unsigned long trans_id;
++ unsigned int trans_id;
+ struct reiserfs_journal *journal = SB_JOURNAL(s);
+
+ flush_jl = tjl = jl;
+@@ -2025,7 +2025,7 @@ static int journal_compare_desc_commit(s
+ */
+ static int journal_transaction_is_valid(struct super_block *p_s_sb,
+ struct buffer_head *d_bh,
+- unsigned long *oldest_invalid_trans_id,
++ unsigned int *oldest_invalid_trans_id,
+ unsigned long *newest_mount_id)
+ {
+ struct reiserfs_journal_desc *desc;
+@@ -2126,18 +2126,18 @@ static void brelse_array(struct buffer_h
+ static int journal_read_transaction(struct super_block *p_s_sb,
+ unsigned long cur_dblock,
+ unsigned long oldest_start,
+- unsigned long oldest_trans_id,
++ unsigned int oldest_trans_id,
+ unsigned long newest_mount_id)
+ {
+ struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+ struct reiserfs_journal_desc *desc;
+ struct reiserfs_journal_commit *commit;
+- unsigned long trans_id = 0;
++ unsigned int trans_id = 0;
+ struct buffer_head *c_bh;
+ struct buffer_head *d_bh;
+ struct buffer_head **log_blocks = NULL;
+ struct buffer_head **real_blocks = NULL;
+- unsigned long trans_offset;
++ unsigned int trans_offset;
+ int i;
+ int trans_half;
+
+@@ -2358,8 +2358,8 @@ static int journal_read(struct super_blo
+ {
+ struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+ struct reiserfs_journal_desc *desc;
+- unsigned long oldest_trans_id = 0;
+- unsigned long oldest_invalid_trans_id = 0;
++ unsigned int oldest_trans_id = 0;
++ unsigned int oldest_invalid_trans_id = 0;
+ time_t start;
+ unsigned long oldest_start = 0;
+ unsigned long cur_dblock = 0;
+@@ -2969,7 +2969,7 @@ static void wake_queued_writers(struct s
+ wake_up(&journal->j_join_wait);
+ }
+
+-static void let_transaction_grow(struct super_block *sb, unsigned long trans_id)
++static void let_transaction_grow(struct super_block *sb, unsigned int trans_id)
+ {
+ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ unsigned long bcount = journal->j_bcount;
+@@ -3000,7 +3000,7 @@ static int do_journal_begin_r(struct rei
+ int join)
+ {
+ time_t now = get_seconds();
+- int old_trans_id;
++ unsigned int old_trans_id;
+ struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+ struct reiserfs_transaction_handle myth;
+ int sched_count = 0;
+@@ -3823,7 +3823,7 @@ static int __commit_trans_jl(struct inod
+
+ int reiserfs_commit_for_inode(struct inode *inode)
+ {
+- unsigned long id = REISERFS_I(inode)->i_trans_id;
++ unsigned int id = REISERFS_I(inode)->i_trans_id;
+ struct reiserfs_journal_list *jl = REISERFS_I(inode)->i_jl;
+
+ /* for the whole inode, assume unset id means it was
+@@ -3937,7 +3937,7 @@ static int do_journal_end(struct reiserf
+ struct reiserfs_journal_list *jl, *temp_jl;
+ struct list_head *entry, *safe;
+ unsigned long jindex;
+- unsigned long commit_trans_id;
++ unsigned int commit_trans_id;
+ int trans_half;
+
+ BUG_ON(th->t_refcount > 1);
+--- a/fs/reiserfs/procfs.c
++++ b/fs/reiserfs/procfs.c
+@@ -323,7 +323,7 @@ static int show_journal(struct seq_file
+ /* incore fields */
+ "j_1st_reserved_block: \t%i\n"
+ "j_state: \t%li\n"
+- "j_trans_id: \t%lu\n"
++ "j_trans_id: \t%u\n"
+ "j_mount_id: \t%lu\n"
+ "j_start: \t%lu\n"
+ "j_len: \t%lu\n"
+@@ -331,7 +331,7 @@ static int show_journal(struct seq_file
+ "j_wcount: \t%i\n"
+ "j_bcount: \t%lu\n"
+ "j_first_unflushed_offset: \t%lu\n"
+- "j_last_flush_trans_id: \t%lu\n"
++ "j_last_flush_trans_id: \t%u\n"
+ "j_trans_start_time: \t%li\n"
+ "j_list_bitmap_index: \t%i\n"
+ "j_must_wait: \t%i\n"
+--- a/include/linux/reiserfs_fs.h
++++ b/include/linux/reiserfs_fs.h
+@@ -1676,7 +1676,7 @@ struct reiserfs_transaction_handle {
+ int t_refcount;
+ int t_blocks_logged; /* number of blocks this writer has logged */
+ int t_blocks_allocated; /* number of blocks this writer allocated */
+- unsigned long t_trans_id; /* sanity check, equals the current trans id */
++ unsigned int t_trans_id; /* sanity check, equals the current trans id */
+ void *t_handle_save; /* save existing current->journal_info */
+ unsigned displace_new_blocks:1; /* if new block allocation occurres, that block
+ should be displaced from others */
+--- a/include/linux/reiserfs_fs_i.h
++++ b/include/linux/reiserfs_fs_i.h
+@@ -51,7 +51,7 @@ struct reiserfs_inode_info {
+ /* we use these for fsync or O_SYNC to decide which transaction
+ ** needs to be committed in order for this inode to be properly
+ ** flushed */
+- unsigned long i_trans_id;
++ unsigned int i_trans_id;
+ struct reiserfs_journal_list *i_jl;
+ struct mutex i_mmap;
+ #ifdef CONFIG_REISERFS_FS_POSIX_ACL
+--- a/include/linux/reiserfs_fs_sb.h
++++ b/include/linux/reiserfs_fs_sb.h
+@@ -156,7 +156,7 @@ struct reiserfs_journal_list {
+ atomic_t j_commit_left;
+ atomic_t j_older_commits_done; /* all commits older than this on disk */
+ struct semaphore j_commit_lock;
+- unsigned long j_trans_id;
++ unsigned int j_trans_id;
+ time_t j_timestamp;
+ struct reiserfs_list_bitmap *j_list_bitmap;
+ struct buffer_head *j_commit_bh; /* commit buffer head */
+@@ -184,7 +184,7 @@ struct reiserfs_journal {
+ int j_1st_reserved_block; /* first block on s_dev of reserved area journal */
+
+ unsigned long j_state;
+- unsigned long j_trans_id;
++ unsigned int j_trans_id;
+ unsigned long j_mount_id;
+ unsigned long j_start; /* start of current waiting commit (index into j_ap_blocks) */
+ unsigned long j_len; /* length of current waiting commit */
+@@ -225,10 +225,10 @@ struct reiserfs_journal {
+ int j_num_work_lists; /* number that need attention from kreiserfsd */
+
+ /* debugging to make sure things are flushed in order */
+- int j_last_flush_id;
++ unsigned int j_last_flush_id;
+
+ /* debugging to make sure things are committed in order */
+- int j_last_commit_id;
++ unsigned int j_last_commit_id;
+
+ struct list_head j_bitmap_nodes;
+ struct list_head j_dirty_buffers;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/show-OSRELEASE-in-VMCOREINFO.diff new/patches.fixes/show-OSRELEASE-in-VMCOREINFO.diff
--- old/patches.fixes/show-OSRELEASE-in-VMCOREINFO.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/show-OSRELEASE-in-VMCOREINFO.diff 2008-07-18 00:21:04.000000000 +0200
@@ -0,0 +1,34 @@
+From 420b501551a043b28d9856020b33e05a97c56f9d Mon Sep 17 00:00:00 2001
+From: Bernhard Walle <bernhard.walle(a)gmx.de>
+Date: Thu, 17 Jul 2008 22:49:59 +0200
+Subject: [PATCH] kdump: Report actual value of VMCOREINFO_OSRELEASE in VMCOREINFO
+
+The current implementation reports the structure name as
+VMCOREINFO_OSRELEASE in VMCOREINFO, e.g.
+
+ VMCOREINFO_OSRELEASE=init_uts_ns.name.release
+
+That doesn't make sense because it's always the same. Instead, use the
+value, e.g.
+
+ VMCOREINFO_OSRELEASE=2.6.26-rc3
+
+Signed-off-by: Bernhard Walle <bwalle(a)suse.de>
+
+---
+ include/linux/kexec.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/linux/kexec.h
++++ b/include/linux/kexec.h
+@@ -140,8 +140,8 @@ void vmcoreinfo_append_str(const char *f
+ __attribute__ ((format (printf, 1, 2)));
+ unsigned long paddr_vmcoreinfo_note(void);
+
+-#define VMCOREINFO_OSRELEASE(name) \
+- vmcoreinfo_append_str("OSRELEASE=%s\n", #name)
++#define VMCOREINFO_OSRELEASE(value) \
++ vmcoreinfo_append_str("OSRELEASE=%s\n", value)
+ #define VMCOREINFO_PAGESIZE(value) \
+ vmcoreinfo_append_str("PAGESIZE=%ld\n", value)
+ #define VMCOREINFO_SYMBOL(name) \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tpm-write-data-types.patch new/patches.fixes/tpm-write-data-types.patch
--- old/patches.fixes/tpm-write-data-types.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/tpm-write-data-types.patch 2008-08-04 12:56:34.000000000 +0200
@@ -0,0 +1,45 @@
+From 0147600172b4a5d261165d1aa5ef818d84da1557 Mon Sep 17 00:00:00 2001
+From: Michael Halcrow <mhalcrow(a)us.ibm.com>
+Date: Fri, 25 Jul 2008 19:45:00 -0700
+Subject: [PATCH] tpm: Use correct data types for sizes in tpm_write() and tpm_read()
+Patch-mainline: 2.6.27
+References: bnc#400211
+
+Use the correct data types for the size parameters in tpm_write() and
+tpm_read(). Note that rw_verify_area() makes sure that this bug cannot
+be exploited to produce a buffer overrun.
+
+Signed-off-by: Michael Halcrow <mhalcrow(a)us.ibm.com>
+Cc: Marcel Selhorst <tpm(a)selhorst.net>
+Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>
+Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
+---
+ drivers/char/tpm/tpm.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
+index f354d72..ae766d8 100644
+--- a/drivers/char/tpm/tpm.c
++++ b/drivers/char/tpm/tpm.c
+@@ -1028,7 +1028,7 @@ ssize_t tpm_write(struct file *file, const char __user *buf,
+ size_t size, loff_t *off)
+ {
+ struct tpm_chip *chip = file->private_data;
+- int in_size = size, out_size;
++ size_t in_size = size, out_size;
+
+ /* cannot perform a write until the read has cleared
+ either via tpm_read or a user_read_timer timeout */
+@@ -1063,7 +1063,7 @@ ssize_t tpm_read(struct file *file, char __user *buf,
+ size_t size, loff_t *off)
+ {
+ struct tpm_chip *chip = file->private_data;
+- int ret_size;
++ ssize_t ret_size;
+
+ del_singleshot_timer_sync(&chip->user_read_timer);
+ flush_scheduled_work();
+--
+1.5.6.2
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/x86_hpet_amd_quirk.patch new/patches.fixes/x86_hpet_amd_quirk.patch
--- old/patches.fixes/x86_hpet_amd_quirk.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/x86_hpet_amd_quirk.patch 2008-08-01 14:03:13.000000000 +0200
@@ -0,0 +1,69 @@
+From: Joachim Deguara <joachim.deguara(a)amd.com>
+Subject: Workaround a hpet BIOS bug which is common on latest AMD driven boards
+Patch-Mainline: not yet
+References: bnc#387053
+
+Signed-off-by: Thomas Renninger <trenn(a)suse.de>
+
+--- x/arch/x86/kernel/early-quirks.c.bak 2008-07-11 14:48:51.000000000 +0800
++++ y/arch/x86/kernel/early-quirks.c 2008-07-11 14:37:41.000000000 +0800
+@@ -21,6 +21,8 @@
+ #include <asm/gart.h>
+ #endif
+
++extern int hpet_rework;
++
+ static void __init fix_hypertransport_config(int num, int slot, int func)
+ {
+ u32 htcfg;
+@@ -109,6 +111,16 @@
+ #endif
+ }
+
++static void __init amd_sb700_hpet(int num, int slot, int func)
++{
++ int rev;
++ rev = read_pci_config_byte(num, slot, func, 0x08);
++ if (rev <= 0x3a && rev >=0x30) {
++ hpet_rework = 1;
++ printk(KERN_INFO "SB700 rev 0x3a under detected!\n");
++ }
++}
++
+ #define QFLAG_APPLY_ONCE 0x1
+ #define QFLAG_APPLIED 0x2
+ #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
+@@ -130,6 +142,8 @@
+ PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, ati_bugs },
+ { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB,
+ PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config },
++ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
++ PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, amd_sb700_hpet },
+ {}
+ };
+
+
+--- x/arch/x86/kernel/hpet.c.bak 2008-06-19 10:42:23.000000000 +0800
++++ y/arch/x86/kernel/hpet.c 2008-07-11 14:09:01.000000000 +0800
+@@ -23,6 +23,9 @@
+ * HPET address is set in acpi/boot.c, when an ACPI entry exists
+ */
+ unsigned long hpet_address;
++
++int hpet_rework __initdata = 0;
++
+ static void __iomem *hpet_virt_address;
+
+ unsigned long hpet_readl(unsigned long a)
+@@ -387,6 +390,11 @@
+ * Read the period and check for a sane value:
+ */
+ hpet_period = hpet_readl(HPET_PERIOD);
++
++ if (hpet_rework) {
++ int timeout = 1000;
++ while (0xffffffff == hpet_readl(HPET_CFG) && timeout-- != 0);
++ }
+ if (hpet_period < HPET_MIN_PERIOD || hpet_period > HPET_MAX_PERIOD)
+ goto out_nohpet;
+
++++++ patches.rt.tar.bz2 ++++++
++++ 65632 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/acpi_provide_non_windows_osi_boot_param.patch new/patches.suse/acpi_provide_non_windows_osi_boot_param.patch
--- old/patches.suse/acpi_provide_non_windows_osi_boot_param.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/acpi_provide_non_windows_osi_boot_param.patch 2008-07-29 17:39:12.000000000 +0200
@@ -0,0 +1,63 @@
+From: Thomas Renninger <trenn(a)suse.de>
+Subject: ACPI: Provide a spec conform OSI interface to the BIOS
+Patch-Mainline: no -> Len does not like it
+
+Introduce acpi_osi=windows_false boot parameter
+
+This will return false to _OSI("Windows XY") calls.
+This is necessary to debug ACPI problems introduced by Windows
+specific bug workarounds
+
+Signed-off-by: Thomas Renninger <trenn(a)suse.de>
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index 0fea7c2..c1e397e 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -182,6 +182,7 @@ and is between 256 and 4096 characters. It is defined in the file
+ acpi_osi= [HW,ACPI] Modify list of supported OS interface strings
+ acpi_osi="string1" # add string1 -- only one string
+ acpi_osi="!string2" # remove built-in string2
++ acpi_osi="windows_false"# remove all Windows strings
+ acpi_osi= # disable all strings
+
+ acpi_serialize [HW,ACPI] force serialization of AML methods
+diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
+index 235a138..bf42ef1 100644
+--- a/drivers/acpi/osl.c
++++ b/drivers/acpi/osl.c
+@@ -943,7 +943,7 @@ static void __init set_osi_linux(unsigned int enable)
+ if (osi_linux.enable != enable) {
+ osi_linux.enable = enable;
+ printk(KERN_NOTICE PREFIX "%sed _OSI(Linux)\n",
+- enable ? "Add": "Delet");
++ enable ? "Add": "Delete");
+ }
+ return;
+ }
+@@ -972,6 +972,17 @@ void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d)
+ return;
+ }
+
++static void __init acpi_osi_windows_false(void) {
++
++ acpi_osi_invalidate("Windows 2000");
++ acpi_osi_invalidate("Windows 2001");
++ acpi_osi_invalidate("Windows 2001 SP1");
++ acpi_osi_invalidate("Windows 2001 SP2");
++ acpi_osi_invalidate("Windows 2001.1");
++ acpi_osi_invalidate("Windows 2001.1 SP1");
++ acpi_osi_invalidate("Windows 2006");
++}
++
+ /*
+ * Modify the list of "OS Interfaces" reported to BIOS via _OSI
+ *
+@@ -984,6 +995,8 @@ int __init acpi_osi_setup(char *str)
+ if (str == NULL || *str == '\0') {
+ printk(KERN_INFO PREFIX "_OSI method disabled\n");
+ acpi_gbl_create_osi_method = FALSE;
++ } else if (strcmp("windows_false", str)) {
++ acpi_osi_windows_false();
+ } else if (!strcmp("!Linux", str)) {
+ acpi_cmdline_osi_linux(0); /* !enable */
+ } else if (*str == '!') {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/genksyms-dump.diff new/patches.suse/genksyms-dump.diff
--- old/patches.suse/genksyms-dump.diff 2008-06-23 17:02:54.000000000 +0200
+++ new/patches.suse/genksyms-dump.diff 2008-08-05 21:33:31.000000000 +0200
@@ -1,7 +1,8 @@
From: Andreas Gruenbacher <agruen(a)suse.de>
-Subject: genksyms: include extern information in type dumps
+Subject: genksyms: include extern information in dumps
-The extern keyword is missing from type dump files (genksyms --dump-types).
+The extern flag currently is not included in type dump files
+(genksyms --dump-types). Include that flag there for completeness.
Signed-off-by: Andreas Gruenbacher <agruen(a)suse.de>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/genksyms-override.diff new/patches.suse/genksyms-override.diff
--- old/patches.suse/genksyms-override.diff 2008-06-23 17:02:54.000000000 +0200
+++ new/patches.suse/genksyms-override.diff 2008-08-05 21:33:31.000000000 +0200
@@ -1,17 +1,18 @@
From: Andreas Gruenbacher <agruen(a)suse.de>
-Subject: genksyms: allow to ignore modversion changes
+Subject: genksyms: allow to ignore symbol checksum changes
-Add an "override" keyword for use in *.symvers / *.symref files: when a
-symbol is overridden, the symbol's old definition will be used in place
-of any new definition in order to preserve the reference modversions
-(see genksyms --reference and genksyms --dump-types). Genksyms will
-still warn about the change.
-
-This is meant to keep the kernel clean from "#ifdef __GENKSYMS__" hacks,
-and to work around modversion changes which are purely due to additional
-"#include" statements. Additional include statements may make more type
-information available to genksyms, which will cause it to compute other
-checksums even though the ABI has not changed.
+This adds an "override" keyword for use in *.symvers / *.symref files. When a
+symbol is overridden, the symbol's old definition will be used for computing
+checksums instead of the new one, preserving the previous checksum. (Genksyms
+will still warn about the change.)
+
+This is meant to allow distributions to hide minor actual as well as fake ABI
+changes. (For example, when extra type information becomes available because
+additional headers are included, this may change checksums even though none of
+the types used have actully changed.)
+
+This approach also allows to get rid of "#ifdef __GENKSYMS__" hacks in the code,
+which are currently used in some vendor kernels to work around checksum changes.
Signed-off-by: Andreas Gruenbacher <agruen(a)suse.de>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/genksyms-reference.diff new/patches.suse/genksyms-reference.diff
--- old/patches.suse/genksyms-reference.diff 2008-06-23 17:02:54.000000000 +0200
+++ new/patches.suse/genksyms-reference.diff 2008-08-05 21:33:31.000000000 +0200
@@ -1,18 +1,22 @@
From: Andreas Gruenbacher <agruen(a)suse.de>
-Subject: genksyms: check for modversion changes
+Subject: genksyms: track symbol checksum changes
-This adds the genksyms --reference option for comparing with a previous
-genksyms run. Genksyms will report when exported symbols have changed
-relative to this reference (and why).
+Sometimes it is preferable to avoid changes of exported symbol checksums (to
+avoid breaking externally provided modules). When a checksum change occurs, it
+can be hard to figure out what caused this change: underlying types may have
+changed, or additional type information may simply have become available at the
+point where a symbol is exported.
-The reference definitions are taken from the dump files produced by
-genksyms --dump-types.
+Add a new --reference option to genksyms which allows it to report why
+checksums change, based on the type information dumps it creates with
+the --dump-types flag. Genksyms will read in such a dump from a previous run,
+and report which symbols have changed (and why).
-The genksyms behavior can be controlled for an entire build as follows:
-If KBUILD_SYMTYPES is set, genksyms uses --dump-types to produce
-*.symtypes dump files. If any *.symref files exist, those will be used
-as the reference to check against. If KBUILD_PRESERVE is set, modversion
-changes will fail the build.
+The behavior can be controlled for an entire build as follows: If
+KBUILD_SYMTYPES is set, genksyms uses --dump-types to produce *.symtypes dump
+files. If any *.symref files exist, those will be used as the reference to
+check against. If KBUILD_PRESERVE is set, checksum changes will fail the
+build.
Signed-off-by: Andreas Gruenbacher <agruen(a)suse.de>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/genksyms-syntax.diff new/patches.suse/genksyms-syntax.diff
--- old/patches.suse/genksyms-syntax.diff 2008-06-23 17:02:54.000000000 +0200
+++ new/patches.suse/genksyms-syntax.diff 2008-08-05 21:33:31.000000000 +0200
@@ -1,12 +1,13 @@
From: Andreas Gruenbacher <agruen(a)suse.de>
-Subject: genksyms: fix the __attribute__ rule
+Subject: genksyms parser: fix the __attribute__ rule
Gcc __attribute__ definitions may occur repeatedly, e.g.,
static int foo __attribute__((__used__))
__attribute__((aligned (16)));
-Fix the genksyms parser to understand this.
+The genksyms parser does not understand this, and generates a syntax error.
+Fix this case.
Signed-off-by: Andreas Gruenbacher <agruen(a)suse.de>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-no-LDFLAGS_MODULE.patch new/patches.suse/ppc-no-LDFLAGS_MODULE.patch
--- old/patches.suse/ppc-no-LDFLAGS_MODULE.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/ppc-no-LDFLAGS_MODULE.patch 2008-08-06 13:14:35.000000000 +0200
@@ -0,0 +1,34 @@
+Subject: arch/powerpc/lib/crtsavres.o is not available when linking external modules
+From: olh(a)suse.de
+Patch-mainline: never
+
+Maybe it helps.
+
+---
+ arch/powerpc/Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.26/arch/powerpc/Makefile
+===================================================================
+--- linux-2.6.26.orig/arch/powerpc/Makefile
++++ linux-2.6.26/arch/powerpc/Makefile
+@@ -89,15 +89,17 @@ ifeq ($(GCC_BROKEN_VEC),y)
+ KBUILD_CFLAGS += $(call cc-option,-mcpu=970)
+ else
+ KBUILD_CFLAGS += $(call cc-option,-mcpu=power4)
++# GCC_BROKEN_VEC
+ endif
+ else
+ KBUILD_CFLAGS += $(call cc-option,-mcpu=power4)
++# CONFIG_ALTIVEC
+ endif
+ else
+ KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
++# CONFIG_POWER4_ONLY
+ endif
+-else
+-LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
++# CONFIG_PPC64
+ endif
+
+ ifeq ($(CONFIG_TUNE_CELL),y)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-reiserfs_panic.diff new/patches.suse/reiserfs-reiserfs_panic.diff
--- old/patches.suse/reiserfs-reiserfs_panic.diff 2008-06-12 18:55:35.000000000 +0200
+++ new/patches.suse/reiserfs-reiserfs_panic.diff 2008-08-06 15:50:59.000000000 +0200
@@ -450,8 +450,8 @@
struct reiserfs_journal_list *jl)
{
if (jl->j_refcount < 1) {
-- reiserfs_panic(s, "trans id %lu, refcount at %d",
-+ reiserfs_panic(s, "journal-2", "trans id %lu, refcount at %d",
+- reiserfs_panic(s, "trans id %u, refcount at %d",
++ reiserfs_panic(s, "journal-2", "trans id %u, refcount at %d",
jl->j_trans_id, jl->j_refcount);
}
if (--jl->j_refcount == 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-rename-p_s_sb.diff new/patches.suse/reiserfs-rename-p_s_sb.diff
--- old/patches.suse/reiserfs-rename-p_s_sb.diff 2008-06-12 18:55:35.000000000 +0200
+++ new/patches.suse/reiserfs-rename-p_s_sb.diff 2008-08-06 15:50:59.000000000 +0200
@@ -571,7 +571,7 @@
-static int _update_journal_header_block(struct super_block *p_s_sb,
+static int _update_journal_header_block(struct super_block *sb,
unsigned long offset,
- unsigned long trans_id)
+ unsigned int trans_id)
{
struct reiserfs_journal_header *jh;
- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
@@ -624,7 +624,7 @@
-static int update_journal_header_block(struct super_block *p_s_sb,
+static int update_journal_header_block(struct super_block *sb,
unsigned long offset,
- unsigned long trans_id)
+ unsigned int trans_id)
{
- return _update_journal_header_block(p_s_sb, offset, trans_id);
+ return _update_journal_header_block(sb, offset, trans_id);
@@ -642,7 +642,7 @@
struct reiserfs_journal_list *other_jl;
- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+ struct reiserfs_journal *journal = SB_JOURNAL(sb);
- unsigned long trans_id = jl->j_trans_id;
+ unsigned int trans_id = jl->j_trans_id;
/* we know we are the only ones flushing things, no extra race
@@ -1361,7 +1361,7 @@ static int flush_older_journal_lists(str
@@ -797,7 +797,7 @@
-static int journal_transaction_is_valid(struct super_block *p_s_sb,
+static int journal_transaction_is_valid(struct super_block *sb,
struct buffer_head *d_bh,
- unsigned long *oldest_invalid_trans_id,
+ unsigned int *oldest_invalid_trans_id,
unsigned long *newest_mount_id)
@@ -2040,7 +2040,7 @@ static int journal_transaction_is_valid(
&& !memcmp(get_journal_desc_magic(d_bh), JOURNAL_DESC_MAGIC, 8)) {
@@ -887,14 +887,14 @@
+static int journal_read_transaction(struct super_block *sb,
unsigned long cur_dblock,
unsigned long oldest_start,
- unsigned long oldest_trans_id,
+ unsigned int oldest_trans_id,
unsigned long newest_mount_id)
{
- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+ struct reiserfs_journal *journal = SB_JOURNAL(sb);
struct reiserfs_journal_desc *desc;
struct reiserfs_journal_commit *commit;
- unsigned long trans_id = 0;
+ unsigned int trans_id = 0;
@@ -2141,45 +2141,45 @@ static int journal_read_transaction(stru
int i;
int trans_half;
@@ -1053,8 +1053,8 @@
- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+ struct reiserfs_journal *journal = SB_JOURNAL(sb);
struct reiserfs_journal_desc *desc;
- unsigned long oldest_trans_id = 0;
- unsigned long oldest_invalid_trans_id = 0;
+ unsigned int oldest_trans_id = 0;
+ unsigned int oldest_invalid_trans_id = 0;
@@ -2377,8 +2377,8 @@ static int journal_read(struct super_blo
int ret;
char b[BDEVNAME_SIZE];
@@ -1488,7 +1488,7 @@
int join)
{
time_t now = get_seconds();
- int old_trans_id;
+ unsigned int old_trans_id;
- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+ struct reiserfs_journal *journal = SB_JOURNAL(sb);
struct reiserfs_transaction_handle myth;
++++++ series.conf ++++++
++++ 789 lines (skipped)
++++ between series.conf
++++ and /mounts/work_src_done/STABLE/kernel-source/series.conf
++++++ supported.conf ++++++
--- kernel-source/supported.conf 2008-07-17 18:37:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/supported.conf 2008-08-06 15:52:12.229365000 +0200
@@ -1344,7 +1344,7 @@
kernel/fs/ext3/ext3 # Second Extended Filesystem with journaling extensions
kernel/fs/fat/fat
- kernel/fs/freevxfs/freevxfs # Veritas Filesystem (VxFS) driver
-- kernel/fs/fuse/fuse # FUSE: Filesystem in Userspace
+ kernel/fs/fuse/fuse # FUSE: Filesystem in Userspace
kernel/fs/hfs/hfs
kernel/fs/hfsplus/hfsplus # Extended Macintosh Filesystem
- kernel/fs/hpfs/hpfs
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 pfmon
checked in at Thu Aug 7 01:33:32 CEST 2008.
--------
--- arch/i386/pfmon/pfmon.changes 2008-02-25 15:35:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/pfmon/pfmon.changes 2008-08-07 00:56:53.445054000 +0200
@@ -1,0 +2,14 @@
+Thu Jul 31 09:49:06 CEST 2008 - schwab(a)suse.de
+
+- Update to pfmon 3.5.
+ - lots of bugs fixes
+ - group unknown symbols as UNKNOWN
+
+- Update to pfmon 3.4.
+ - lots of bugs fixes in generic and arch-specific code
+ - support for dmalloc
+ - support for SIGTERM to terminate pfmon cleanly
+ - Cell updates
+ - dlopen tracking in mixed ABI environments
+
+-------------------------------------------------------------------
Old:
----
pfmon-3.3.diff
pfmon-3.3.tar.gz
New:
----
pfmon-3.5.diff
pfmon-3.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pfmon.spec ++++++
--- /var/tmp/diff_new_pack.S31876/_old 2008-08-07 01:33:19.000000000 +0200
+++ /var/tmp/diff_new_pack.S31876/_new 2008-08-07 01:33:19.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package pfmon (Version 3.3)
+# spec file for package pfmon (Version 3.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -14,12 +21,12 @@
Url: http://perfmon2.sourceforge.net/
BuildRequires: binutils-devel libelf-devel libpfm-devel
Summary: Performance monitoring tool for Linux
-Version: 3.3
+Version: 3.5
Release: 1
Group: Development/Tools/Debuggers
License: GPL v2 or later
AutoReqProv: on
-Source: pfmon-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/perfmon2/pfmon-%{version}.tar.gz
Patch: pfmon-%{version}.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ia64 %ix86 x86_64
@@ -57,6 +64,16 @@
%{_mandir}/man*/*.gz
%changelog
+* Thu Jul 31 2008 schwab(a)suse.de
+- Update to pfmon 3.5.
+ - lots of bugs fixes
+ - group unknown symbols as UNKNOWN
+- Update to pfmon 3.4.
+ - lots of bugs fixes in generic and arch-specific code
+ - support for dmalloc
+ - support for SIGTERM to terminate pfmon cleanly
+ - Cell updates
+ - dlopen tracking in mixed ABI environments
* Mon Feb 25 2008 schwab(a)suse.de
- Update to pfmon 3.3.
* Wed Feb 06 2008 schwab(a)suse.de
@@ -86,7 +103,7 @@
* Wed Oct 20 2004 rw(a)suse.de
- Add cpusets support (feature request by SGI). (#46996)
- Fix compilation post-SLES9 (e.g. SLES9 SP1).
-* Tue Dec 02 2003 schwab(a)suse.de
+* Wed Dec 03 2003 schwab(a)suse.de
- Update to pfmon 3.0.
* Mon Jan 13 2003 schwab(a)suse.de
- Update to final version 2.0.
++++++ pfmon-3.3.diff -> pfmon-3.5.diff ++++++
--- arch/i386/pfmon/pfmon-3.3.diff 2008-02-25 15:39:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/pfmon/pfmon-3.5.diff 2008-07-31 09:48:59.000000000 +0200
@@ -11,16 +11,16 @@
@set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d all; done
--- pfmon/pfmon.h
+++ pfmon/pfmon.h
-@@ -114,7 +114,7 @@ typedef enum {
+@@ -117,7 +117,7 @@ typedef enum {
/*
* max number of cpus (threads) supported
*/
--#define PFMON_MAX_CPUS 2048 /* MUST BE power of 2 */
-+#define PFMON_MAX_CPUS (sizeof(cpu_set_t)*8) /* MUST BE power of 2 */
+-#define PFMON_MAX_CPUS __CPU_SETSIZE /* MUST BE power of 2 */
++#define PFMON_MAX_CPUS (sizeof(cpu_set_t)*8)
/*
* max number of PMU models supported
*/
-@@ -122,11 +122,9 @@ typedef enum {
+@@ -125,11 +125,9 @@ typedef enum {
#define PFMON_BITMASK_BITS (sizeof(unsigned long)<<3)
@@ -35,36 +35,6 @@
#define PFMON_MAX_FILENAME_LEN 256 /* max for output/input files */
#define PFMON_MAX_CMDLINE_LEN 1024 /* per-task mode max cmdline length /proc/cmdline */
---- pfmon/smpl_mod/dear_hist_ia64.c
-+++ pfmon/smpl_mod/dear_hist_ia64.c
-@@ -186,7 +186,7 @@ dear_hist_process_samples_normal(pfmon_s
- unsigned long addr;
- unsigned int l2_latency, l3_latency;
- size_t sample_size;
-- void *hash_desc = csmpl->data, *data;
-+ void *hash_desc, *data;
- void *pos;
- hash_data_t *hash_entry;
- pfmon_hash_key_t key;
-@@ -196,6 +196,7 @@ dear_hist_process_samples_normal(pfmon_s
-
- csmpl = &sdesc->csmpl;
- hdr = csmpl->smpl_hdr;
-+ hash_desc = csmpl->data;
-
- pos = hdr+1;
- entry = options.opt_aggr ? *csmpl->aggr_count : csmpl->entry_count;
---- pfmon/smpl_mod/inst_hist_ia64_old_smpl.c
-+++ pfmon/smpl_mod/inst_hist_ia64_old_smpl.c
-@@ -308,7 +308,7 @@ inst_hist_show_results(pfmon_sdesc_t *sd
- pfmon_smpl_desc_t *csmpl;
- FILE *fp;
- hash_data_t **tab;
-- unsigned long addr, ns;
-+ unsigned long addr, ns = 0;
- unsigned long i, num_entries, j;
- double d_cum, cum_total;
- hash_sort_arg_t arg;
--- tests/Makefile
+++ tests/Makefile
@@ -58,7 +58,7 @@ libxyz.so:
++++++ pfmon-3.3.tar.gz -> pfmon-3.5.tar.gz ++++++
++++ 4034 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
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 NetworkManager-novellvpn
checked in at Thu Aug 7 01:32:53 CEST 2008.
--------
--- NetworkManager-novellvpn/NetworkManager-novellvpn.changes 2008-06-24 08:32:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-novellvpn/NetworkManager-novellvpn.changes 2008-08-06 08:26:27.357246000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 6 08:35:25 CEST 2008 - bili(a)suse.de
+
+- Convert the UI for NM which is at least SVN revision r3761.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-novellvpn-0.7.1.tar.gz
NetworkManager-novellvpn-dismiss_warn_debug.patch
NetworkManager-novellvpn-enusure_kill.patch
NetworkManager-novellvpn-keyring.patch
NetworkManager-novellvpn-support_id.patch
New:
----
NetworkManager-novellvpn-0.7.2.tar.gz
NetworkManager-novellvpn-no-prefix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-novellvpn.spec ++++++
--- /var/tmp/diff_new_pack.F20800/_old 2008-08-07 01:30:34.000000000 +0200
+++ /var/tmp/diff_new_pack.F20800/_new 2008-08-07 01:30:34.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package NetworkManager-novellvpn (Version 0.7.1)
+# spec file for package NetworkManager-novellvpn (Version 0.7.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# 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/
#
@@ -14,17 +21,14 @@
Name: NetworkManager-novellvpn
BuildRequires: NetworkManager-devel NetworkManager-gnome intltool libglade2-devel libgnomeui-devel libnl-devel perl-XML-Parser update-desktop-files
Summary: VPN support for Turnpike.
-Version: 0.7.1
-Release: 31
+Version: 0.7.2
+Release: 1
License: GPL v2 or later
Group: Productivity/Networking/System
Url: http://www.gnome.org/projects/NetworkManager
Source0: %{name}-%{version}.tar.gz
Source1: gnome-mime-application-x-novellvpn-settings.png
-Patch0: %{name}-support_id.patch
-Patch1: %{name}-dismiss_warn_debug.patch
-Patch2: %{name}-enusure_kill.patch
-Patch3: %{name}-keyring.patch
+Patch0: %{name}-no-prefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: NetworkManager >= 0.7.0
Requires: %{name}-frontend
@@ -75,9 +79,6 @@
#'
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
@@ -88,7 +89,7 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
-rm $RPM_BUILD_ROOT%{_libdir}/libnm-novellvpn-properties.la
+rm $RPM_BUILD_ROOT%{_libdir}/NetworkManager/libnm-novellvpn-properties.la
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
#mkdir -p $RPM_BUILD_ROOT/%{sysconfdir}/NetworkManager/dispatcher.d
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/hicolor/48x48/apps/gnome-mime-application-x-novellvpn-settings.png
@@ -111,13 +112,13 @@
%{_sysconfdir}/NetworkManager/VPN/nm-novellvpn-service.name
#%{sysconfdir}/NetworkManager/dispatcher.d/racoon
%{_sysconfdir}/dbus-1/system.d/nm-novellvpn-service.conf
-%{_bindir}/nm-novellvpn-service
-%{_bindir}/nm-novellvpn-service-novellvpn-helper
+%{_libexecdir}/nm-novellvpn-service
+%{_libexecdir}/nm-novellvpn-service-novellvpn-helper
%{_libexecdir}/nm_novellvpn_racoon_launcher.sh
%files gnome
%defattr(-,root,root,-)
-%{_libdir}/libnm-novellvpn-properties.so*
+%{_libdir}/NetworkManager/libnm-novellvpn-properties.so*
%{_libexecdir}/nm-novellvpn-auth-dialog
%dir %{_datadir}/%{name}/
%dir %{_datadir}/%{name}/applications
@@ -128,6 +129,8 @@
%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-novellvpn-settings.png
%changelog
+* Wed Aug 06 2008 bili(a)suse.de
+- Convert the UI for NM which is at least SVN revision r3761.
* Tue Jun 24 2008 bili(a)suse.de
- Fix password saving in keyring(bnc#396638).
* Fri May 23 2008 bili(a)suse.de
++++++ NetworkManager-novellvpn-0.7.1.tar.gz -> NetworkManager-novellvpn-0.7.2.tar.gz ++++++
++++ 11149 lines of diff (skipped)
++++++ NetworkManager-novellvpn-no-prefix.patch ++++++
Index: NetworkManager-novellvpn-0.7.2/src/nm-novellvpn-service-novellvpn-helper.c
===================================================================
--- NetworkManager-novellvpn-0.7.2.orig/src/nm-novellvpn-service-novellvpn-helper.c
+++ NetworkManager-novellvpn-0.7.2/src/nm-novellvpn-service-novellvpn-helper.c
@@ -440,8 +440,8 @@ main(int argc, char *argv[])//, char **e
val = addr_to_gvalue (getenv("route_netmask_1"));
if (NULL != val) {
g_hash_table_insert (config,
- NM_VPN_PLUGIN_IP4_CONFIG_PREFIX,
- //NM_VPN_PLUGIN_IP4_CONFIG_NETMASK, // "netmask"
+ //NM_VPN_PLUGIN_IP4_CONFIG_PREFIX,
+ NM_VPN_PLUGIN_IP4_CONFIG_NETMASK, // "netmask"
val);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0