SOURCES (DEVEL): apache1-ipv6-PLD.patch, drupal-mod-tinymce.conf, ...
glen
glen at pld-linux.org
Mon Jul 17 13:47:52 CEST 2006
Author: glen Date: Mon Jul 17 11:47:52 2006 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
lighttpd.conf
---- Files affected:
SOURCES:
apache1-ipv6-PLD.patch (1.11 -> 1.12) , drupal-mod-tinymce.conf (1.3 -> 1.4) , kernel-i386.config (1.82.10.140 -> 1.82.10.140.2.1) , lighttpd.conf (1.30.2.6 -> 1.30.2.7) , php4-mail.patch (1.10 -> 1.11) , pirut-desktop.patch (1.3 -> 1.4) , shadow-removed-programs.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/apache1-ipv6-PLD.patch
diff -u SOURCES/apache1-ipv6-PLD.patch:1.11 SOURCES/apache1-ipv6-PLD.patch:1.12
--- SOURCES/apache1-ipv6-PLD.patch:1.11 Tue Oct 18 10:27:05 2005
+++ SOURCES/apache1-ipv6-PLD.patch Mon Jul 17 13:47:47 2006
@@ -1,4 +1,3 @@
-diff -Nur apache_1.3.28.orig/README.v6 apache_1.3.28/README.v6
--- apache_1.3.28.orig/README.v6 Thu Jan 1 01:00:00 1970
+++ apache_1.3.28/README.v6 Fri Jul 25 11:01:55 2003
@@ -0,0 +1,166 @@
@@ -168,7 +167,6 @@
+ http://www.v6.linux.or.jp/
+ YOSHIFUJI Hideaki, USAGI Project
+ http://www.linux-ipv6.org/
-diff -Nur apache_1.3.28.orig/conf/httpd.conf-dist apache_1.3.28/conf/httpd.conf-dist
--- apache_1.3.28.orig/conf/httpd.conf-dist Wed Jul 16 21:36:41 2003
+++ apache_1.3.28/conf/httpd.conf-dist Fri Jul 25 11:01:55 2003
@@ -174,6 +174,11 @@
@@ -183,14 +181,12 @@
#
# BindAddress: You can support virtual hosts with this option. This directive
# is used to tell the server which IP address to listen to. It can either
-diff -Nur apache_1.3.28.orig/configure.v6 apache_1.3.28/configure.v6
--- apache_1.3.28.orig/configure.v6 Thu Jan 1 01:00:00 1970
+++ apache_1.3.28/configure.v6 Fri Jul 25 11:01:55 2003
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+./configure --enable-rule=INET6 --enable-module=proxy $*
-diff -Nur apache_1.3.28.orig/src/Configuration.tmpl apache_1.3.28/src/Configuration.tmpl
--- apache_1.3.28.orig/src/Configuration.tmpl Fri Jul 25 11:00:49 2003
+++ apache_1.3.28/src/Configuration.tmpl Fri Jul 25 11:01:55 2003
@@ -191,6 +191,9 @@
@@ -211,7 +207,6 @@
Rule CYGWIN_WINSOCK=no
# DEV_RANDOM:
-diff -Nur apache_1.3.28.orig/src/Configure apache_1.3.28/src/Configure
--- apache_1.3.28.orig/src/Configure Fri Jul 25 11:00:49 2003
+++ apache_1.3.28/src/Configure Fri Jul 25 11:01:55 2003
@@ -238,6 +238,7 @@
@@ -386,7 +381,6 @@
####################################################################
## More building ap_config_auto.h
##
-diff -Nur apache_1.3.28.orig/src/ap/ap_snprintf.c apache_1.3.28/src/ap/ap_snprintf.c
--- apache_1.3.28.orig/src/ap/ap_snprintf.c Mon Feb 3 18:13:17 2003
+++ apache_1.3.28/src/ap/ap_snprintf.c Fri Jul 25 11:01:55 2003
@@ -73,6 +73,7 @@
@@ -465,7 +459,6 @@
else {
s = S_NULL;
s_len = S_NULL_LEN;
-diff -Nur apache_1.3.28.orig/src/include/ap.h apache_1.3.28/src/include/ap.h
--- apache_1.3.28.orig/src/include/ap.h Mon Feb 3 18:13:17 2003
+++ apache_1.3.28/src/include/ap.h Fri Jul 25 11:01:55 2003
@@ -95,7 +95,8 @@
@@ -478,7 +471,6 @@
* %pp takes a void * and outputs it in hex
*
* The %p hacks are to force gcc's printf warning code to skip
-diff -Nur apache_1.3.28.orig/src/include/ap_config.h apache_1.3.28/src/include/ap_config.h
--- apache_1.3.28.orig/src/include/ap_config.h Mon May 5 13:45:49 2003
+++ apache_1.3.28/src/include/ap_config.h Fri Jul 25 11:01:55 2003
@@ -411,6 +411,10 @@
@@ -563,7 +555,6 @@
#ifdef __cplusplus
}
#endif
-diff -Nur apache_1.3.28.orig/src/include/http_conf_globals.h apache_1.3.28/src/include/http_conf_globals.h
--- apache_1.3.28.orig/src/include/http_conf_globals.h Fri Jul 25 11:00:49 2003
+++ apache_1.3.28/src/include/http_conf_globals.h Fri Jul 25 11:01:55 2003
@@ -82,7 +82,8 @@
@@ -576,7 +567,6 @@
extern listen_rec *ap_listeners;
extern API_VAR_EXPORT int ap_daemons_to_start;
extern API_VAR_EXPORT int ap_daemons_min_free;
-diff -Nur apache_1.3.28.orig/src/include/http_vhost.h apache_1.3.28/src/include/http_vhost.h
--- apache_1.3.28.orig/src/include/http_vhost.h Mon Feb 3 18:13:19 2003
+++ apache_1.3.28/src/include/http_vhost.h Fri Jul 25 11:01:55 2003
@@ -73,7 +73,7 @@
@@ -588,7 +578,6 @@
/* given an ip address only, give our best guess as to what vhost it is */
API_EXPORT(void) ap_update_vhost_given_ip(conn_rec *conn);
-diff -Nur apache_1.3.28.orig/src/include/httpd.h apache_1.3.28/src/include/httpd.h
--- apache_1.3.28.orig/src/include/httpd.h Fri Jul 25 11:00:49 2003
+++ apache_1.3.28/src/include/httpd.h Fri Jul 25 11:01:55 2003
@@ -904,8 +904,8 @@
@@ -631,7 +620,6 @@
extern API_VAR_EXPORT time_t ap_restart_time;
-diff -Nur apache_1.3.28.orig/src/include/sa_len.h apache_1.3.28/src/include/sa_len.h
--- apache_1.3.28.orig/src/include/sa_len.h Thu Jan 1 01:00:00 1970
+++ apache_1.3.28/src/include/sa_len.h Fri Jul 25 11:01:55 2003
@@ -0,0 +1,41 @@
@@ -676,7 +664,6 @@
+}
+#endif /* SA_LEN */
+#endif /* HAVE_SOCKADDR_LEN */
-diff -Nur apache_1.3.28.orig/src/include/sockaddr_storage.h apache_1.3.28/src/include/sockaddr_storage.h
--- apache_1.3.28.orig/src/include/sockaddr_storage.h Thu Jan 1 01:00:00 1970
+++ apache_1.3.28/src/include/sockaddr_storage.h Fri Jul 25 11:01:55 2003
@@ -0,0 +1,53 @@
@@ -733,7 +720,6 @@
+#define su_port su_si.si_port
+
+#endif /* NEED_SOCKADDR_STORAGE */
-diff -Nur apache_1.3.28.orig/src/main/getaddrinfo.c apache_1.3.28/src/main/getaddrinfo.c
--- apache_1.3.28.orig/src/main/getaddrinfo.c Thu Jan 1 01:00:00 1970
+++ apache_1.3.28/src/main/getaddrinfo.c Fri Jul 25 11:01:55 2003
@@ -0,0 +1,162 @@
@@ -899,7 +885,6 @@
+ }
+ return EAI_NODATA;
+}
-diff -Nur apache_1.3.28.orig/src/main/getnameinfo.c apache_1.3.28/src/main/getnameinfo.c
--- apache_1.3.28.orig/src/main/getnameinfo.c Thu Jan 1 01:00:00 1970
+++ apache_1.3.28/src/main/getnameinfo.c Fri Jul 25 11:01:55 2003
@@ -0,0 +1,95 @@
@@ -998,7 +983,6 @@
+ return EAI_NODATA;
+ return 0;
+}
-diff -Nur apache_1.3.28.orig/src/main/http_config.c apache_1.3.28/src/main/http_config.c
--- apache_1.3.28.orig/src/main/http_config.c Fri Jul 25 11:00:49 2003
+++ apache_1.3.28/src/main/http_config.c Fri Jul 25 11:01:55 2003
@@ -1591,7 +1591,6 @@
@@ -1381,7 +1365,6 @@
"A numeric IP address:port, or the name of a host" },
#ifdef _OSD_POSIX
{ "BS2000Account", set_bs2000_account, NULL, RSRC_CONF, TAKE1,
-diff -Nur apache_1.3.28.orig/src/main/http_main.c apache_1.3.28/src/main/http_main.c
--- apache_1.3.28.orig/src/main/http_main.c Fri Jul 25 11:00:49 2003
+++ apache_1.3.28/src/main/http_main.c Fri Jul 25 12:13:12 2003
@@ -124,6 +124,8 @@
@@ -2429,7 +2412,6 @@
/* otherwise we're stuck with just the main server
* and no name-based vhosts
*/
-diff -Nur apache_1.3.28.orig/src/main/rfc1413.c apache_1.3.28/src/main/rfc1413.c
--- apache_1.3.28.orig/src/main/rfc1413.c Mon Feb 3 18:13:23 2003
+++ apache_1.3.28/src/main/rfc1413.c Fri Jul 25 12:15:05 2003
@@ -82,6 +82,7 @@
@@ -2569,7 +2551,6 @@
}
ap_set_callback_and_alarm(NULL, 0);
ap_pclosesocket(conn->pool, sock);
-diff -Nur apache_1.3.28.orig/src/main/util.c apache_1.3.28/src/main/util.c
--- apache_1.3.28.orig/src/main/util.c Mon Feb 3 18:13:23 2003
+++ apache_1.3.28/src/main/util.c Fri Jul 25 11:01:55 2003
@@ -2017,52 +2017,87 @@
@@ -2769,7 +2750,6 @@
+#ifdef NEED_GETNAMEINFO
+#include "getnameinfo.c"
+#endif
-diff -Nur apache_1.3.28.orig/src/main/util_script.c apache_1.3.28/src/main/util_script.c
--- apache_1.3.28.orig/src/main/util_script.c Mon Feb 3 18:13:23 2003
+++ apache_1.3.28/src/main/util_script.c Fri Jul 25 11:01:55 2003
@@ -67,6 +67,7 @@
@@ -2807,7 +2787,6 @@
if (c->user) {
ap_table_addn(e, "REMOTE_USER", c->user);
-diff -Nur apache_1.3.28.orig/src/main/util_uri.c apache_1.3.28/src/main/util_uri.c
--- apache_1.3.28.orig/src/main/util_uri.c Mon Feb 3 18:13:24 2003
+++ apache_1.3.28/src/main/util_uri.c Fri Jul 25 11:01:55 2003
@@ -424,6 +424,12 @@
@@ -2837,7 +2816,6 @@
if (s == NULL) {
return HTTP_BAD_REQUEST;
}
-diff -Nur apache_1.3.28.orig/src/modules/proxy/mod_proxy.c apache_1.3.28/src/modules/proxy/mod_proxy.c
--- apache_1.3.28.orig/src/modules/proxy/mod_proxy.c Fri Jul 25 11:00:49 2003
+++ apache_1.3.28/src/modules/proxy/mod_proxy.c Fri Jul 25 11:01:55 2003
@@ -574,11 +574,31 @@
@@ -2891,7 +2869,6 @@
new->port = port;
return NULL;
}
-diff -Nur apache_1.3.28.orig/src/modules/proxy/mod_proxy.h apache_1.3.28/src/modules/proxy/mod_proxy.h
--- apache_1.3.28.orig/src/modules/proxy/mod_proxy.h Mon Feb 3 18:13:26 2003
+++ apache_1.3.28/src/modules/proxy/mod_proxy.h Fri Jul 25 11:01:55 2003
@@ -310,7 +310,7 @@
@@ -2903,7 +2880,6 @@
int ap_proxy_garbage_init(server_rec *, pool *);
/* This function is called by ap_table_do() for all header lines */
int ap_proxy_send_hdr_line(void *p, const char *key, const char *value);
-diff -Nur apache_1.3.28.orig/src/modules/proxy/proxy_connect.c apache_1.3.28/src/modules/proxy/proxy_connect.c
--- apache_1.3.28.orig/src/modules/proxy/proxy_connect.c Mon Feb 3 18:13:26 2003
+++ apache_1.3.28/src/modules/proxy/proxy_connect.c Fri Jul 25 11:27:12 2003
@@ -113,14 +113,15 @@
@@ -3077,7 +3053,6 @@
if (i == -1) {
ap_pclosesocket(r->pool, sock);
return ap_proxyerror(r, HTTP_INTERNAL_SERVER_ERROR, ap_pstrcat(r->pool,
-diff -Nur apache_1.3.28.orig/src/modules/proxy/proxy_ftp.c apache_1.3.28/src/modules/proxy/proxy_ftp.c
--- apache_1.3.28.orig/src/modules/proxy/proxy_ftp.c Mon Feb 3 18:13:26 2003
+++ apache_1.3.28/src/modules/proxy/proxy_ftp.c Fri Jul 25 11:18:38 2003
@@ -62,6 +62,7 @@
@@ -3635,7 +3610,6 @@
/*
* update the cache file, possibly even fulfilling the request if it
* turns out a conditional allowed us to serve the object from the
-diff -Nur apache_1.3.28.orig/src/modules/proxy/proxy_util.c apache_1.3.28/src/modules/proxy/proxy_util.c
--- apache_1.3.28.orig/src/modules/proxy/proxy_util.c Mon Feb 3 18:13:26 2003
+++ apache_1.3.28/src/modules/proxy/proxy_util.c Fri Jul 25 11:01:55 2003
@@ -64,6 +64,7 @@
@@ -4170,7 +4144,6 @@
case T_HOST:
if (!gothost) {
remotehost = ap_get_remote_host(r->connection, r->per_dir_config,
-diff -Nur apache_1.3.28.orig/src/modules/standard/mod_unique_id.c apache_1.3.28/src/modules/standard/mod_unique_id.c
--- apache_1.3.28.orig/src/modules/standard/mod_unique_id.c Mon Feb 3 18:13:30 2003
+++ apache_1.3.28/src/modules/standard/mod_unique_id.c Fri Jul 25 11:01:55 2003
@@ -67,10 +67,22 @@
@@ -4302,7 +4275,6 @@
/*
* If we use 0 as the initial counter we have a little less protection
-diff -Nur apache_1.3.28.orig/src/support/ab.c apache_1.3.28/src/support/ab.c
--- apache_1.3.28.orig/src/support/ab.c Sun Jul 6 19:52:27 2003
+++ apache_1.3.28/src/support/ab.c Fri Jul 25 11:01:55 2003
@@ -158,6 +158,8 @@
@@ -4461,7 +4433,6 @@
+#ifdef NEED_GETADDRINFO
+#include "../main/getaddrinfo.c"
+#endif
-diff -Nur apache_1.3.28.orig/src/support/logresolve.c apache_1.3.28/src/support/logresolve.c
--- apache_1.3.28.orig/src/support/logresolve.c Wed May 23 00:52:21 2001
+++ apache_1.3.28/src/support/logresolve.c Fri Jul 25 11:01:55 2003
@@ -54,7 +54,9 @@
================================================================
Index: SOURCES/drupal-mod-tinymce.conf
diff -u SOURCES/drupal-mod-tinymce.conf:1.3 SOURCES/drupal-mod-tinymce.conf:1.4
--- SOURCES/drupal-mod-tinymce.conf:1.3 Tue Sep 27 15:50:49 2005
+++ SOURCES/drupal-mod-tinymce.conf Mon Jul 17 13:47:47 2006
@@ -1,22 +1,5 @@
# $Id$
-# TinyMCE alias for TinyMCE Drupal module.
-#
-# If you're using top level domain, you should comment out the first configuration.
-# Drupal installed in /drupal.
-<IfModule mod_alias.c>
- Alias /drupal/modules/tinymce/jscripts/tiny_mce /usr/share/tinymce
- <Location /drupal/modules/tinymce/jscripts/tiny_mce>
- allow from all
- </Location>
-</IfModule>
-
-# Drupal installed in top level vhost.
-<IfModule mod_alias.c>
- Alias /modules/tinymce/jscripts/tiny_mce /usr/share/tinymce
- <Location /modules/tinymce/jscripts/tiny_mce>
- allow from all
- </Location>
-</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
+<Directory /usr/share/mydelfi_cm/www>
+ Allow from all
+</Directory>
================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.140 SOURCES/kernel-i386.config:1.82.10.140.2.1
--- SOURCES/kernel-i386.config:1.82.10.140 Mon Jun 5 11:45:50 2006
+++ SOURCES/kernel-i386.config Mon Jul 17 13:47:47 2006
@@ -899,6 +899,7 @@
CONFIG_BLK_DEV_XD=m
CONFIG_PARIDE=m
CONFIG_PARIDE_PARPORT=m
+CONFIG_BLK_DEV_IO_TRACE=y
#
# Parallel IDE high-level drivers
@@ -2872,7 +2873,7 @@
#
# File systems
#
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
@@ -2950,6 +2951,7 @@
CONFIG_HUGETLB_PAGE=y
CONFIG_RAMFS=y
CONFIG_RELAYFS_FS=m
+CONFIG_RELAY=y
CONFIG_CONFIGFS_FS=m
#
@@ -3215,3 +3217,5 @@
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_KTIME_SCALAR=y
+
+CONFIG_LSF=y
================================================================
Index: SOURCES/lighttpd.conf
diff -u SOURCES/lighttpd.conf:1.30.2.6 SOURCES/lighttpd.conf:1.30.2.7
--- SOURCES/lighttpd.conf:1.30.2.6 Sat Jul 15 23:22:02 2006
+++ SOURCES/lighttpd.conf Mon Jul 17 13:47:47 2006
@@ -75,6 +75,9 @@
#$SERVER["socket"] == ":443" {
# ssl.engine = "enable"
# ssl.pemfile = "/etc/lighttpd/server.pem"
+# $HTTP["useragent"] =~ "MSIE" {
+# server.max-keepalive-requests = 0
+# }
#}
# webapps configs
================================================================
Index: SOURCES/php4-mail.patch
diff -u SOURCES/php4-mail.patch:1.10 SOURCES/php4-mail.patch:1.11
--- SOURCES/php4-mail.patch:1.10 Sat Mar 27 00:58:25 2004
+++ SOURCES/php4-mail.patch Mon Jul 17 13:47:47 2006
@@ -1,5 +1,5 @@
---- php-4.3.0/ext/standard/mail.c.orig Fri Nov 29 12:15:43 2002
-+++ php-4.3.0/ext/standard/mail.c Thu Jan 2 12:37:54 2003
+--- php-4.3.0/ext/standard/mail.c Thu Jan 2 12:37:54 2003
++++ php-5.1.4-mail/ext/standard/mail.c 2006-06-07 17:48:45.197705968 +0300
@@ -21,6 +21,8 @@
#include <stdlib.h>
#include <ctype.h>
@@ -19,7 +19,43 @@
#if HAVE_SENDMAIL
#ifdef PHP_WIN32
#include "win32/sendmail.h"
-@@ -196,8 +201,42 @@
+@@ -104,6 +109,35 @@
+ return;
+ }
+
++ /* check for spam attempts with buggy webforms */
++ if (strchr(to, '\n') != NULL || strchr(to, '\r') != NULL) {
++ zend_error(E_WARNING, "Newlines aren't allowed in the To header. Mail not sent.");
++ RETURN_FALSE;
++ }
++
++ if (strchr(subject, '\n') != NULL || strchr(subject, '\r') != NULL) {
++ zend_error(E_WARNING, "Newlines aren't allowed in the Subject header. Mail not sent.");
++ RETURN_FALSE;
++ }
++
++ /* search for to, cc or bcc headers */
++ if (headers != NULL) {
++ if (strncasecmp(headers, "to:", sizeof("to:") - 1) == 0 || strcasestr(headers, "\nto:")) {
++ zend_error(E_WARNING, "To: headers aren't allowed in the additional_headers parameter. Mail not sent.");
++ RETURN_FALSE;
++ }
++
++ if (strncasecmp(headers, "cc:", sizeof("cc:") - 1) == 0 || strcasestr(headers, "\ncc:")) {
++ zend_error(E_WARNING, "CC: headers aren't allowed in the additional_headers parameter. Mail not sent.");
++ RETURN_FALSE;
++ }
++
++ if (strncasecmp(headers, "bcc:", sizeof("bcc:") - 1) == 0 || strcasestr(headers, "\nbcc:")) {
++ zend_error(E_WARNING, "BCC: headers aren't allowed in the additional_headers parameter. Mail not sent.");
++ RETURN_FALSE;
++ }
++ }
++
+ if (to_len > 0) {
+ to_r = estrndup(to, to_len);
+ for (; to_len; to_len--) {
+@@ -196,8 +230,42 @@
return 0;
}
#endif
================================================================
Index: SOURCES/pirut-desktop.patch
diff -u SOURCES/pirut-desktop.patch:1.3 SOURCES/pirut-desktop.patch:1.4
--- SOURCES/pirut-desktop.patch:1.3 Fri May 26 12:31:53 2006
+++ SOURCES/pirut-desktop.patch Mon Jul 17 13:47:47 2006
@@ -1,5 +1,5 @@
--- pirut-1.0.1/data/pirut.desktop.in 2006-03-01 01:56:27.000000000 +0200
-+++ pirut-1.0.1.desktop/data/pirut.desktop 2006-05-26 13:11:37.359189448 +0300
++++ pirut-1.0.1.desktop/data/pirut.desktop.in 2006-05-26 13:11:37.359189448 +0300
@@ -2,10 +2,11 @@
Name=Add/Remove Software
GenericName=Add/Remove Software
@@ -15,7 +15,7 @@
StartupNotify=true
+NotShowIn=KDE
--- pirut-1.0.1/data/pup.desktop.in 2006-03-01 01:56:28.000000000 +0200
-+++ pirut-1.0.1.desktop/data/pup.desktop 2006-05-26 13:10:51.618166176 +0300
++++ pirut-1.0.1.desktop/data/pup.desktop.in 2006-05-26 13:10:51.618166176 +0300
@@ -2,10 +2,11 @@
Name=Software Updater
GenericName=Software Updater
@@ -31,7 +31,7 @@
StartupNotify=true
+NotShowIn=KDE
--- pirut-1.0.1/data/system-install-packages.desktop.in 2006-03-01 01:56:28.000000000 +0200
-+++ pirut-1.0.1.desktop/data/system-install-packages.desktop 2006-05-26 13:09:52.186836659 +0300
++++ pirut-1.0.1.desktop/data/system-install-packages.desktop.in 2006-05-26 13:09:52.186836659 +0300
@@ -2,11 +2,12 @@
Name=Install software
GenericName=Install software
================================================================
Index: SOURCES/shadow-removed-programs.patch
diff -u SOURCES/shadow-removed-programs.patch:1.3 SOURCES/shadow-removed-programs.patch:1.4
--- SOURCES/shadow-removed-programs.patch:1.3 Sat Jun 10 22:00:20 2006
+++ SOURCES/shadow-removed-programs.patch Mon Jul 17 13:47:47 2006
@@ -1,3 +1,18 @@
+
+# included in glibc-devel
+rm -f $RPM_BUILD_ROOT%{_mandir}{,*/}/man3/{getspnam,shadow}.3
+# /bin/login already in login (from util-linux.spec)
+rm -f $RPM_BUILD_ROOT{%{_bindir}/login,/etc/pam.d/login,%{_sbindir}/logoutd,%{_mandir}/{,*/}man1/login.1,%{_mandir}/{,*/}man5/porttime.5,%{_mandir}/{,*/}man8/logoutd.8}
+# /bin/id already in coreutils
+rm -f $RPM_BUILD_ROOT%{_mandir}{,*/}/man1/id.1
+# /bin/su already in coreutils
+rm -f $RPM_BUILD_ROOT{%{_bindir}/su,/etc/pam.d/su,%{_mandir}/{,*/}man1/su.1}
+# /usr/bin/groups already in coreutils
+rm -f $RPM_BUILD_ROOT{%{_bindir}/groups,%{_mandir}/{,*/}man1/groups.1}
+# /etc/limits not used with pam
+rm -f $RPM_BUILD_ROOT%{_mandir}/{,*/}man5/limits.5
+
+
--- shadow-4.0.16/src/Makefile.am 2006-06-10 22:33:57.905406488 +0300
+++ shadow-4.0.16/src/Makefile.am 2006-06-10 22:56:13.765287219 +0300
@@ -20,7 +20,6 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/apache1-ipv6-PLD.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/SOURCES/drupal-mod-tinymce.conf?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.140&r2=1.82.10.140.2.1&f=u
http://cvs.pld-linux.org/SOURCES/lighttpd.conf?r1=1.30.2.6&r2=1.30.2.7&f=u
http://cvs.pld-linux.org/SOURCES/php4-mail.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SOURCES/pirut-desktop.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/shadow-removed-programs.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list