rpms/ss5/F-9 import.log, NONE, 1.1 ss5_init.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ss5.spec, 1.7, 1.8
by Itamar Reis Peixoto
Author: itamarjp
Update of /cvs/pkgs/rpms/ss5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30926/F-9
Modified Files:
.cvsignore sources ss5.spec
Added Files:
import.log ss5_init.patch
Log Message:
fix initscript
--- NEW FILE import.log ---
ss5-3_6_4-2_fc10:F-9:ss5-3.6.4-2.fc10.src.rpm:1233410233
ss5_init.patch:
--- NEW FILE ss5_init.patch ---
diff -ruNp ss5-3.6.4.old/conf/ss5.init ss5-3.6.4.new/conf/ss5.init
--- ss5-3.6.4.old/conf/ss5.init 2007-04-17 11:40:43.000000000 -0300
+++ ss5-3.6.4.new/conf/ss5.init 2009-01-28 01:08:43.000000000 -0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# chkconfig: 345 20 80
+# chkconfig: - 20 80
# description: This script takes care of starting \
# and stopping ss5
#
@@ -31,7 +31,7 @@ case "$1" in
if [ $OS = "Linux" ]; then
daemon /usr/sbin/ss5 -t $SS5_OPTS
touch /var/lock/subsys/ss5
- if [ $OS = "SunOS" ]; then
+ elif [ $OS = "SunOS" ]; then
/usr/sbin/ss5 -t
touch /var/lock/subsys/ss5
else
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Jun 2006 18:23:26 -0000 1.2
+++ .cvsignore 31 Jan 2009 13:58:21 -0000 1.3
@@ -1 +1 @@
-ss5-3.5.9-1.tar.gz
+ss5-3.6.4-3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Jun 2006 18:23:26 -0000 1.2
+++ sources 31 Jan 2009 13:58:21 -0000 1.3
@@ -1 +1 @@
-c75ec9a9b3060cc5bfc58343da6a05e8 ss5-3.5.9-1.tar.gz
+9d9b27a538747d397fadf4bd2b897f6f ss5-3.6.4-3.tar.gz
Index: ss5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-9/ss5.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ss5.spec 19 Feb 2008 15:24:04 -0000 1.7
+++ ss5.spec 31 Jan 2009 13:58:21 -0000 1.8
@@ -1,24 +1,28 @@
Summary: Socks Server 5
Name: ss5
-Version: 3.5.9
-Release: 7
-License: GPL
+Version: 3.6.4
+Release: 2%{?dist}
+License: GPLv2+
Group: Applications/Internet
URL: http://sourceforge.net/projects/ss5
-Source: http://prdownloads.sourceforge.net/ss5/ss5-3.5.9-1.tar.gz
+Source: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openldap-devel pam-devel
+Requires(post): chkconfig
+Requires(preun): chkconfig, initscripts
+
+Patch0: ss5_init.patch
%description
ss5 is a socks server, which supports both SOCKS4 and SOCKS5 protocols,
that runs on Linux/Solaris platforms.
%prep
-%setup
+%setup -q
+%patch0 -p1
%build
-
-./configure --with-libpath=%{_libdir}
+%configure --with-libpath=%{_libdir}
make %{?_smp_mflags}
%install
@@ -41,37 +45,46 @@
fi
%files
-%defattr(755,root,root)
+%defattr(-,root,root,-)
%{_sbindir}/ss5
%{_initrddir}/ss5
%{_libdir}/ss5/
-%defattr(644,root,root)
%dir %{_docdir}/ss5
%{_docdir}/ss5/License
%{_docdir}/ss5/README.pam
%dir %{_docdir}/ss5/examples
%{_docdir}/ss5/examples/ss5.pam
%{_docdir}/ss5/README.ldap
+%{_docdir}/ss5/README.balamgr
+%{_docdir}/ss5/README.statmgr
%{_docdir}/ss5/examples/slapd.conf
%{_docdir}/ss5/examples/entries.ldif
%{_mandir}/man1/ss5.1.gz
%{_mandir}/man5/ss5.passwd.5.gz
-%{_mandir}/man5/ss5.peers.5.gz
%{_mandir}/man5/ss5.conf.5.gz
%{_mandir}/man5/ss5.pam.5.gz
+%{_mandir}/man5/ss5.ha.5.gz
-%defattr(755,root,root)
%{_localstatedir}/log/ss5
%dir %{_sysconfdir}/opt/ss5
-%defattr(0640,root,root)
%config(noreplace) %{_sysconfdir}/opt/ss5/ss5.conf
%config(noreplace) %{_sysconfdir}/opt/ss5/ss5.passwd
%config(noreplace) %{_sysconfdir}/pam.d/ss5
+%doc ChangeLog
%changelog
+* Wed Jan 28 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 3.6.4-2
+- fix init script BZ #478702
+- replace some tabs with spaces in changelog
+- fix wrong permissions in spec file
+
+* Fri Sep 5 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 3.6.4-1
+- fix license tag
+- update to 3.6.4
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 3.5.9-7
- Autorebuild for GCC 4.3
@@ -98,7 +111,7 @@
* Fix DNS buffer as RFC
*Fri May 05 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v3.5.8-2 released
+ * SS5-v3.5.8-2 released
* Fix startup script
*Wed Apr 26 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
@@ -106,13 +119,13 @@
* Fix EAP (thx to Jakob Perz)
*Mon Apr 24 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v3.5.7-1 released
- * Fix replica feature
+ * SS5-v3.5.7-1 released
+ * Fix replica feature
* Fix configure file
* Fix man file for ss5.peers
*Mon Apr 10 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v3.5.6-1 released
+ * SS5-v3.5.6-1 released
* Fix startup script
*Thu Apr 06 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
@@ -128,11 +141,11 @@
* Fix external authentication program
*Sun Mar 19 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v3.5.3-2 released
+ * SS5-v3.5.3-2 released
* Fix package for Fedora naming guidelines
*Thu Mar 09 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v3.5.3-1 released
+ * SS5-v3.5.3-1 released
* Add security feature to centralized management
*Thu Mar 09 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
@@ -172,14 +185,14 @@
* New configure file (thx to Walter Franzini)
*Tue Feb 07 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v3.3r5 released
+ * SS5-v3.3r5 released
* Fix Solaris 10 compatibility with ctime_r() call
* Fix netbios default domain
*Mon Feb 06 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
* SS5-v3.3r4 released
* Add default netbios domain
- * Fix externalprogram
+ * Fix externalprogram
*Sat Feb 04 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
* SS5-v3.3r3 released
@@ -193,7 +206,7 @@
*Mon Jan 20 2006 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
* SS5-v3.3r1 released
- * Add multiple directory store support
+ * Add multiple directory store support
* Add netbios compatibility in authorization module
* Add noproxy rule in mod_socks5
@@ -207,7 +220,7 @@
* Fix module authentication (pam)
*Mon Dec 16 2005 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v3.2r5 released
+ * SS5-v3.2r5 released
* Fix makefile for gcc old version
*Mon Dec 04 2005 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
@@ -249,7 +262,7 @@
* Fix recv call
*Mon Aug 22 2005 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v3.0r9 released
+ * SS5-v3.0r9 released
* Fix SS5_AUTHCACHEAGE option
*Thu Aug 18 2005 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
@@ -266,15 +279,15 @@
*Thu May 10 2005 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
* SS5-v3.0r5 released
- * Fix connect response using dns
+ * Fix connect response using dns
* Increase authentication buffer
- * Fix profiling bug
+ * Fix profiling bug
* Modify package structure
*Thu Apr 10 2005 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
* SS5-v3.0r4 released
* Added comment into group file
-
+
*Thu Mar 10 2005 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
* SS5-v3.0r3 released
* Pam module fix
@@ -315,7 +328,7 @@
*Thu Dec 30 2003 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
* SS5-v2.4r5 released
* Fix Solaris documentation
- * Fix admin access check
+ * Fix admin access check
* Add statistics information
*Thu Dec 24 2003 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
@@ -329,10 +342,10 @@
*Thu Nov 15 2003 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
* SS5-v2.4r2 released
* Fix some potential buffer overflow
- * Fix udp bind problem
+ * Fix udp bind problem
*Thu Oct 29 2003 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
- * SS5-v2.4r1 released
+ * SS5-v2.4r1 released
* Add session affinity in balanced connections
* Add socks statistics about connections
* Add fake authentication
@@ -361,8 +374,8 @@
* SS5-v2.3r1 released
* Add source-if feature for connect operation
* Add better control in ldap base configuration
- * Add better detail on log messages
- * Threads creation improvement
+ * Add better detail on log messages
+ * Threads creation improvement
* Fix automatic configuration reload (every 30 seconds)
*Thu Aug 14 2003 Matteo Ricchetti <matteo.ricchetti(a)libero.it>
@@ -370,7 +383,7 @@
* Add ldap profile feature
* Add PAM authentication
* Add username for ss5 execution
- * Add server balancing feature !!!
+ * Add server balancing feature !!!
* Add ssl fixup
* Add pop3 fixup
* Add imap fixup
14Â years
rpms/ss5/devel import.log,1.1,1.2
by Itamar Reis Peixoto
Author: itamarjp
Update of /cvs/pkgs/rpms/ss5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29306/devel
Modified Files:
import.log
Log Message:
fix initscript
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 28 Jan 2009 04:19:12 -0000 1.1
+++ import.log 31 Jan 2009 13:52:26 -0000 1.2
@@ -1 +1,2 @@
ss5-3_6_4-2_fc9:HEAD:ss5-3.6.4-2.fc9.src.rpm:1233115244
+ss5-3_6_4-2_fc10:HEAD:ss5-3.6.4-2.fc10.src.rpm:1233409811
14Â years
rpms/goffice/devel .cvsignore, 1.9, 1.10 goffice.spec, 1.21, 1.22 sources, 1.9, 1.10
by belegdol
Author: belegdol
Update of /cvs/pkgs/rpms/goffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23669
Modified Files:
.cvsignore goffice.spec sources
Log Message:
* Sat Jan 31 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.6-1
- Updated to 0.6.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 7 Sep 2008 00:17:37 -0000 1.9
+++ .cvsignore 31 Jan 2009 13:09:48 -0000 1.10
@@ -1 +1 @@
-goffice-0.6.5.tar.bz2
+goffice-0.6.6.tar.bz2
Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- goffice.spec 12 Jan 2009 09:42:54 -0000 1.21
+++ goffice.spec 31 Jan 2009 13:09:48 -0000 1.22
@@ -1,6 +1,6 @@
Name: goffice
-Version: 0.6.5
-Release: 2%{?dist}
+Version: 0.6.6
+Release: 1%{?dist}
Summary: Goffice support libraries
Group: System Environment/Libraries
# bug filed upstream about this being GPL v2 only:
@@ -77,6 +77,9 @@
%changelog
+* Sat Jan 31 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.6-1
+- Updated to 0.6.6
+
* Mon Jan 12 2009 Caolán McNamara <caolanm(a)redhat.com> - 0.6.5-2
- rebuild to get provides pkgconfig(libgoffice-0.4) >= 0:0.4.0
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 7 Sep 2008 00:17:37 -0000 1.9
+++ sources 31 Jan 2009 13:09:48 -0000 1.10
@@ -1 +1 @@
-ab0cf11995b7750f26112669cedf6707 goffice-0.6.5.tar.bz2
+92e51878b9cd9c2fa954953d708f2c47 goffice-0.6.6.tar.bz2
14Â years
rpms/nfs-utils/F-9 nfs-utils-1.1.2-tcpwrap-cleanup.patch, NONE, 1.1 nfs-utils-1.1.2-tcpwrap-hash.patch, NONE, 1.1 nfs-utils-1.1.2-tcpwrap-newrules.patch, NONE, 1.1 nfs-utils.spec, 1.180, 1.181 nfs-utils-1.1.2-tcpwrap-rulecheck.patch, 1.1, NONE
by Steve Dickson
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16491
Modified Files:
nfs-utils.spec
Added Files:
nfs-utils-1.1.2-tcpwrap-cleanup.patch
nfs-utils-1.1.2-tcpwrap-hash.patch
nfs-utils-1.1.2-tcpwrap-newrules.patch
Removed Files:
nfs-utils-1.1.2-tcpwrap-rulecheck.patch
Log Message:
- Reworked tcp wrapper code to correctly use API (bz 480223)
- General clean up of tcp wrapper code.
nfs-utils-1.1.2-tcpwrap-cleanup.patch:
--- NEW FILE nfs-utils-1.1.2-tcpwrap-cleanup.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 06:17:18 2009 -0500
General clean up. Removed unused routines. Reworked syslog
message to (hopefully) make it more sensible. Move
"#ifdef HAVE_LIBWRAP" around so nothing will be defined
when tcp wrapper is not configured.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:27:54.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:31:32.000000000 -0500
@@ -34,6 +34,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#ifdef HAVE_LIBWRAP
#include <tcpwrapper.h>
#include <unistd.h>
#include <string.h>
@@ -57,40 +58,10 @@
static void logit(int severity, struct sockaddr_in *addr,
u_long procnum, u_long prognum, char *text);
-static void toggle_verboselog(int sig);
-int verboselog = 0;
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;
-
-/* A handful of macros for "readability". */
-
-#ifdef HAVE_LIBWRAP
-/* coming from libwrap.a (tcp_wrappers) */
-extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
-#else
-int hosts_ctl(char *daemon, char *name, char *addr, char *user)
-{
- return 0;
-}
-#endif
-
-#define legal_port(a,p) \
- (ntohs((a)->sin_port) < IPPORT_RESERVED || (p) >= IPPORT_RESERVED)
-
-#define log_bad_port(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from unprivileged port")
+static int check_files(void);
#define log_bad_host(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from unauthorized host")
-
-#define log_bad_owner(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from non-local host")
-
-#define log_no_forward(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request not forwarded")
-
-#define log_client(addr, proc, prog) \
- logit(allow_severity, addr, proc, prog, "")
+ logit(LOG_WARNING, addr, proc, prog, "request from unauthorized host")
#define ALLOW 1
#define DENY 0
@@ -180,46 +151,9 @@ struct sockaddr_in *addr;
return DENY;
}
-/* check_startup - additional startup code */
-
-void check_startup(void)
-{
-
- /*
- * Give up root privileges so that we can never allocate a privileged
- * port when forwarding an rpc request.
- *
- * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it,
- * switch to that uid, otherwise simply resue the old bin user and print
- * out a warning in syslog.
- */
-
- struct passwd *pwent;
-
- pwent = getpwnam("rpc");
- if (pwent == NULL) {
- syslog(LOG_WARNING, "user rpc not found, reverting to user bin");
- if (setuid(1) == -1) {
- syslog(LOG_ERR, "setuid(1) failed: %m");
- exit(1);
- }
- }
- else {
- if (setuid(pwent->pw_uid) == -1) {
- syslog(LOG_WARNING, "setuid() to rpc user failed: %m");
- if (setuid(1) == -1) {
- syslog(LOG_ERR, "setuid(1) failed: %m");
- exit(1);
- }
- }
- }
-
- (void) signal(SIGINT, toggle_verboselog);
-}
-
/* check_files - check to see if either access files have changed */
-int check_files()
+static int check_files()
{
static time_t allow_mtime, deny_mtime;
struct stat astat, dstat;
@@ -268,78 +202,21 @@ u_long prog;
haccess_add(addr, prog, FALSE);
return (FALSE);
}
- if (verboselog)
- log_client(addr, proc, prog);
if (acc)
acc->access = TRUE;
else
haccess_add(addr, prog, TRUE);
- return (TRUE);
-}
-/* check_privileged_port - additional checks for privileged-port updates */
-int
-check_privileged_port(struct sockaddr_in *addr,
- u_long proc, u_long prog, u_long port)
-{
-#ifdef CHECK_PORT
- if (!legal_port(addr, port)) {
- log_bad_port(addr, proc, prog);
- return (FALSE);
- }
-#endif
return (TRUE);
}
-/* toggle_verboselog - toggle verbose logging flag */
-
-static void toggle_verboselog(int sig)
-{
- (void) signal(sig, toggle_verboselog);
- verboselog = !verboselog;
-}
-
/* logit - report events of interest via the syslog daemon */
static void logit(int severity, struct sockaddr_in *addr,
u_long procnum, u_long prognum, char *text)
{
- char *procname;
- char procbuf[16 + 4 * sizeof(u_long)];
- char *progname;
- char progbuf[16 + 4 * sizeof(u_long)];
- struct rpcent *rpc;
-
- /*
- * Fork off a process or the portmap daemon might hang while
- * getrpcbynumber() or syslog() does its thing.
- *
- * Don't forget to wait for the children, too...
- */
-
- if (fork() == 0) {
-
- /* Try to map program number to name. */
-
- if (prognum == 0) {
- progname = "";
- } else if ((rpc = getrpcbynumber((int) prognum))) {
- progname = rpc->r_name;
- } else {
- snprintf(progname = progbuf, sizeof (progbuf),
- "prog (%lu)", prognum);
- }
-
- /* Try to map procedure number to name. */
-
- snprintf(procname = procbuf, sizeof (procbuf),
- "proc (%lu)", (u_long) procnum);
-
- /* Write syslog record. */
-
- syslog(severity, "connect from %s to %s in %s%s",
- inet_ntoa(addr->sin_addr), procname, progname, text);
- exit(0);
- }
+ syslog(severity, "connect from %s denied: %s",
+ inet_ntoa(addr->sin_addr), text);
}
+#endif
nfs-utils-1.1.2-tcpwrap-hash.patch:
--- NEW FILE nfs-utils-1.1.2-tcpwrap-hash.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 05:30:13 2009 -0500
Only hash on IP address and Program number. Including the Procedure
number only creates needles extra hash entries.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:22:35.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:23:22.000000000 -0500
@@ -106,8 +106,8 @@ typedef struct _hash_head {
TAILQ_HEAD(host_list, _haccess_t) h_head;
} hash_head;
hash_head haccess_tbl[HASH_TABLE_SIZE];
-static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long, u_long);
-static void haccess_add(struct sockaddr_in *addr, u_long, u_long, int);
+static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long);
+static void haccess_add(struct sockaddr_in *addr, u_long, int);
inline unsigned int strtoint(char *str)
{
@@ -124,11 +124,10 @@ inline int hashint(unsigned int num)
{
return num % HASH_TABLE_SIZE;
}
-#define HASH(_addr, _proc, _prog) \
- hashint((strtoint((_addr))+(_proc)+(_prog)))
+#define HASH(_addr, _prog) \
+ hashint((strtoint((_addr))+(_prog)))
-void haccess_add(struct sockaddr_in *addr, u_long proc,
- u_long prog, int access)
+void haccess_add(struct sockaddr_in *addr, u_long prog, int access)
{
hash_head *head;
haccess_t *hptr;
@@ -138,7 +137,7 @@ void haccess_add(struct sockaddr_in *add
if (hptr == NULL)
return;
- hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+ hash = HASH(inet_ntoa(addr->sin_addr), prog);
head = &(haccess_tbl[hash]);
hptr->access = access;
@@ -149,13 +148,13 @@ void haccess_add(struct sockaddr_in *add
else
TAILQ_INSERT_TAIL(&head->h_head, hptr, list);
}
-haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long proc, u_long prog)
+haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long prog)
{
hash_head *head;
haccess_t *hptr;
int hash;
- hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+ hash = HASH(inet_ntoa(addr->sin_addr), prog);
head = &(haccess_tbl[hash]);
TAILQ_FOREACH(hptr, &head->h_head, list) {
@@ -300,7 +299,7 @@ u_long prog;
haccess_t *acc = NULL;
int changed = check_files();
- acc = haccess_lookup(addr, proc, prog);
+ acc = haccess_lookup(addr, prog);
if (acc && changed == 0)
return (acc->access);
@@ -309,7 +308,7 @@ u_long prog;
if (acc)
acc->access = FALSE;
else
- haccess_add(addr, proc, prog, FALSE);
+ haccess_add(addr, prog, FALSE);
return (FALSE);
}
if (verboselog)
@@ -318,7 +317,7 @@ u_long prog;
if (acc)
acc->access = TRUE;
else
- haccess_add(addr, proc, prog, TRUE);
+ haccess_add(addr, prog, TRUE);
return (TRUE);
}
nfs-utils-1.1.2-tcpwrap-newrules.patch:
--- NEW FILE nfs-utils-1.1.2-tcpwrap-newrules.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 05:50:51 2009 -0500
Converted good_client() to correctly use the tcp wrapper
interface and added a note to the mountd man page saying
hostnames will be ignored when they can not be looked up.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:25:16.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:26:27.000000000 -0500
@@ -46,7 +46,7 @@
#include <sys/signal.h>
#include <sys/queue.h>
#include <sys/stat.h>
-#include <unistd.h>
+#include <tcpd.h>
#include "xlog.h"
@@ -169,58 +169,15 @@ good_client(daemon, addr)
char *daemon;
struct sockaddr_in *addr;
{
- struct hostent *hp;
- char **sp;
- char *tmpname;
-
- /* First check the address. */
- if (hosts_ctl(daemon, "", inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
-
- /* Now do the hostname lookup */
- hp = gethostbyaddr ((const char *) &(addr->sin_addr),
- sizeof (addr->sin_addr), AF_INET);
- if (!hp) {
- xlog(L_WARNING,
- "Warning: Client IP address '%s' not found in host lookup",
- inet_ntoa(addr->sin_addr));
- return DENY; /* never heard of it. misconfigured DNS? */
- }
-
- /* Make sure the hostent is authorative. */
- tmpname = strdup(hp->h_name);
- if (!tmpname) {
- xlog(L_WARNING, "Warning: No memory for Host access check");
- return DENY;
- }
- hp = gethostbyname(tmpname);
- if (!hp) {
- xlog(L_WARNING,
- "Warning: Client hostname '%s' not found in host lookup", tmpname);
- free(tmpname);
- return DENY; /* never heard of it. misconfigured DNS? */
- }
- free(tmpname);
+ struct request_info req;
- /* Now make sure the address is on the list */
- for (sp = hp->h_addr_list ; *sp ; sp++) {
- if (memcmp(*sp, &(addr->sin_addr), hp->h_length) == 0)
- break;
- }
- if (!*sp)
- return DENY; /* it was a FAKE. */
+ request_init(&req, RQ_DAEMON, daemon, RQ_CLIENT_SIN, addr, 0);
+ sock_methods(&req);
- /* Check the official name and address. */
- if (hosts_ctl(daemon, hp->h_name, inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
-
- /* Now check aliases. */
- for (sp = hp->h_aliases; *sp ; sp++) {
- if (hosts_ctl(daemon, *sp, inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
- }
+ if (hosts_access(&req))
+ return ALLOW;
- return ALLOW;
+ return DENY;
}
/* check_startup - additional startup code */
diff -up nfs-utils-1.1.4/utils/mountd/mountd.man.orig nfs-utils-1.1.4/utils/mountd/mountd.man
--- nfs-utils-1.1.4/utils/mountd/mountd.man.orig 2008-10-17 10:20:09.000000000 -0400
+++ nfs-utils-1.1.4/utils/mountd/mountd.man 2009-01-31 06:26:27.000000000 -0500
@@ -181,13 +181,15 @@ mountd: .bar.com
You have to use the daemon name
.B mountd
for the daemon name (even if the binary has a different name).
+.B Note:
+hostnames used in either access file will be ignored when
+they can not be resolved into IP addresses.
For further information please have a look at the
.BR tcpd (8)
and
.BR hosts_access (5)
manual pages.
-
.SH SEE ALSO
.BR rpc.nfsd (8),
.BR exportfs (8),
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-9/nfs-utils.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- nfs-utils.spec 20 Jan 2009 12:14:32 -0000 1.180
+++ nfs-utils.spec 31 Jan 2009 12:13:47 -0000 1.181
@@ -2,7 +2,7 @@
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.1.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -36,7 +36,9 @@
Patch11: nfs-utils-1.1.2-tcpwrapper-update.patch
Patch12: nfs-utils-1.1.2-tcpwrap-warn.patch
Patch13: nfs-utils-1.1.2-gssd-verbosity.patch
-Patch14: nfs-utils-1.1.2-tcpwrap-rulecheck.patch
+Patch14: nfs-utils-1.1.2-tcpwrap-hash.patch
+Patch15: nfs-utils-1.1.2-tcpwrap-newrules.patch
+Patch16: nfs-utils-1.1.2-tcpwrap-cleanup.patch
%if %{enablefscache}
Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -102,6 +104,8 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
+%patch16 -p1
%if %{enablefscache}
%patch90 -p1
@@ -265,6 +269,10 @@
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Sat Jan 31 2009 Steve Dickson <steved(a)redhat.com> 1.1.2-11
+- Reworked tcp wrapper code to correctly use API (bz 480223)
+- General clean up of tcp wrapper code.
+
* Tue Jan 20 2009 Steve Dickson <steved(a)redhat.com> 1.1.2-10
- mountd: Don't do tcp wrapper check when there are no rules (bz 448898)
--- nfs-utils-1.1.2-tcpwrap-rulecheck.patch DELETED ---
14Â years
rpms/nfs-utils/F-10 nfs-utils-1.1.4-tcpwrap-cleanup.patch, NONE, 1.1 nfs-utils-1.1.4-tcpwrap-hash.patch, NONE, 1.1 nfs-utils-1.1.4-tcpwrap-newrules.patch, NONE, 1.1 nfs-utils.spec, 1.199, 1.200 nfs-utils-1.1.4-tcpwrap-rulecheck.patch, 1.1, NONE
by Steve Dickson
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14043
Modified Files:
nfs-utils.spec
Added Files:
nfs-utils-1.1.4-tcpwrap-cleanup.patch
nfs-utils-1.1.4-tcpwrap-hash.patch
nfs-utils-1.1.4-tcpwrap-newrules.patch
Removed Files:
nfs-utils-1.1.4-tcpwrap-rulecheck.patch
Log Message:
- Reworked tcp wrapper code to correctly use API (bz 480223)
- General clean up of tcp wrapper code.
nfs-utils-1.1.4-tcpwrap-cleanup.patch:
--- NEW FILE nfs-utils-1.1.4-tcpwrap-cleanup.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 06:17:18 2009 -0500
General clean up. Removed unused routines. Reworked syslog
message to (hopefully) make it more sensible. Move
"#ifdef HAVE_LIBWRAP" around so nothing will be defined
when tcp wrapper is not configured.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:27:54.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:31:32.000000000 -0500
@@ -34,6 +34,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#ifdef HAVE_LIBWRAP
#include <tcpwrapper.h>
#include <unistd.h>
#include <string.h>
@@ -57,40 +58,10 @@
static void logit(int severity, struct sockaddr_in *addr,
u_long procnum, u_long prognum, char *text);
-static void toggle_verboselog(int sig);
-int verboselog = 0;
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;
-
-/* A handful of macros for "readability". */
-
-#ifdef HAVE_LIBWRAP
-/* coming from libwrap.a (tcp_wrappers) */
-extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
-#else
-int hosts_ctl(char *daemon, char *name, char *addr, char *user)
-{
- return 0;
-}
-#endif
-
-#define legal_port(a,p) \
- (ntohs((a)->sin_port) < IPPORT_RESERVED || (p) >= IPPORT_RESERVED)
-
-#define log_bad_port(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from unprivileged port")
+static int check_files(void);
#define log_bad_host(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from unauthorized host")
-
-#define log_bad_owner(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from non-local host")
-
-#define log_no_forward(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request not forwarded")
-
-#define log_client(addr, proc, prog) \
- logit(allow_severity, addr, proc, prog, "")
+ logit(LOG_WARNING, addr, proc, prog, "request from unauthorized host")
#define ALLOW 1
#define DENY 0
@@ -180,46 +151,9 @@ struct sockaddr_in *addr;
return DENY;
}
-/* check_startup - additional startup code */
-
-void check_startup(void)
-{
-
- /*
- * Give up root privileges so that we can never allocate a privileged
- * port when forwarding an rpc request.
- *
- * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it,
- * switch to that uid, otherwise simply resue the old bin user and print
- * out a warning in syslog.
- */
-
- struct passwd *pwent;
-
- pwent = getpwnam("rpc");
- if (pwent == NULL) {
- syslog(LOG_WARNING, "user rpc not found, reverting to user bin");
- if (setuid(1) == -1) {
- syslog(LOG_ERR, "setuid(1) failed: %m");
- exit(1);
- }
- }
- else {
- if (setuid(pwent->pw_uid) == -1) {
- syslog(LOG_WARNING, "setuid() to rpc user failed: %m");
- if (setuid(1) == -1) {
- syslog(LOG_ERR, "setuid(1) failed: %m");
- exit(1);
- }
- }
- }
-
- (void) signal(SIGINT, toggle_verboselog);
-}
-
/* check_files - check to see if either access files have changed */
-int check_files()
+static int check_files()
{
static time_t allow_mtime, deny_mtime;
struct stat astat, dstat;
@@ -268,78 +202,21 @@ u_long prog;
haccess_add(addr, prog, FALSE);
return (FALSE);
}
- if (verboselog)
- log_client(addr, proc, prog);
if (acc)
acc->access = TRUE;
else
haccess_add(addr, prog, TRUE);
- return (TRUE);
-}
-/* check_privileged_port - additional checks for privileged-port updates */
-int
-check_privileged_port(struct sockaddr_in *addr,
- u_long proc, u_long prog, u_long port)
-{
-#ifdef CHECK_PORT
- if (!legal_port(addr, port)) {
- log_bad_port(addr, proc, prog);
- return (FALSE);
- }
-#endif
return (TRUE);
}
-/* toggle_verboselog - toggle verbose logging flag */
-
-static void toggle_verboselog(int sig)
-{
- (void) signal(sig, toggle_verboselog);
- verboselog = !verboselog;
-}
-
/* logit - report events of interest via the syslog daemon */
static void logit(int severity, struct sockaddr_in *addr,
u_long procnum, u_long prognum, char *text)
{
- char *procname;
- char procbuf[16 + 4 * sizeof(u_long)];
- char *progname;
- char progbuf[16 + 4 * sizeof(u_long)];
- struct rpcent *rpc;
-
- /*
- * Fork off a process or the portmap daemon might hang while
- * getrpcbynumber() or syslog() does its thing.
- *
- * Don't forget to wait for the children, too...
- */
-
- if (fork() == 0) {
-
- /* Try to map program number to name. */
-
- if (prognum == 0) {
- progname = "";
- } else if ((rpc = getrpcbynumber((int) prognum))) {
- progname = rpc->r_name;
- } else {
- snprintf(progname = progbuf, sizeof (progbuf),
- "prog (%lu)", prognum);
- }
-
- /* Try to map procedure number to name. */
-
- snprintf(procname = procbuf, sizeof (procbuf),
- "proc (%lu)", (u_long) procnum);
-
- /* Write syslog record. */
-
- syslog(severity, "connect from %s to %s in %s%s",
- inet_ntoa(addr->sin_addr), procname, progname, text);
- exit(0);
- }
+ syslog(severity, "connect from %s denied: %s",
+ inet_ntoa(addr->sin_addr), text);
}
+#endif
nfs-utils-1.1.4-tcpwrap-hash.patch:
--- NEW FILE nfs-utils-1.1.4-tcpwrap-hash.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 05:30:13 2009 -0500
Only hash on IP address and Program number. Including the Procedure
number only creates needles extra hash entries.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:22:35.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:23:22.000000000 -0500
@@ -106,8 +106,8 @@ typedef struct _hash_head {
TAILQ_HEAD(host_list, _haccess_t) h_head;
} hash_head;
hash_head haccess_tbl[HASH_TABLE_SIZE];
-static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long, u_long);
-static void haccess_add(struct sockaddr_in *addr, u_long, u_long, int);
+static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long);
+static void haccess_add(struct sockaddr_in *addr, u_long, int);
inline unsigned int strtoint(char *str)
{
@@ -124,11 +124,10 @@ inline int hashint(unsigned int num)
{
return num % HASH_TABLE_SIZE;
}
-#define HASH(_addr, _proc, _prog) \
- hashint((strtoint((_addr))+(_proc)+(_prog)))
+#define HASH(_addr, _prog) \
+ hashint((strtoint((_addr))+(_prog)))
-void haccess_add(struct sockaddr_in *addr, u_long proc,
- u_long prog, int access)
+void haccess_add(struct sockaddr_in *addr, u_long prog, int access)
{
hash_head *head;
haccess_t *hptr;
@@ -138,7 +137,7 @@ void haccess_add(struct sockaddr_in *add
if (hptr == NULL)
return;
- hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+ hash = HASH(inet_ntoa(addr->sin_addr), prog);
head = &(haccess_tbl[hash]);
hptr->access = access;
@@ -149,13 +148,13 @@ void haccess_add(struct sockaddr_in *add
else
TAILQ_INSERT_TAIL(&head->h_head, hptr, list);
}
-haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long proc, u_long prog)
+haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long prog)
{
hash_head *head;
haccess_t *hptr;
int hash;
- hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+ hash = HASH(inet_ntoa(addr->sin_addr), prog);
head = &(haccess_tbl[hash]);
TAILQ_FOREACH(hptr, &head->h_head, list) {
@@ -300,7 +299,7 @@ u_long prog;
haccess_t *acc = NULL;
int changed = check_files();
- acc = haccess_lookup(addr, proc, prog);
+ acc = haccess_lookup(addr, prog);
if (acc && changed == 0)
return (acc->access);
@@ -309,7 +308,7 @@ u_long prog;
if (acc)
acc->access = FALSE;
else
- haccess_add(addr, proc, prog, FALSE);
+ haccess_add(addr, prog, FALSE);
return (FALSE);
}
if (verboselog)
@@ -318,7 +317,7 @@ u_long prog;
if (acc)
acc->access = TRUE;
else
- haccess_add(addr, proc, prog, TRUE);
+ haccess_add(addr, prog, TRUE);
return (TRUE);
}
nfs-utils-1.1.4-tcpwrap-newrules.patch:
--- NEW FILE nfs-utils-1.1.4-tcpwrap-newrules.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 05:50:51 2009 -0500
Converted good_client() to correctly use the tcp wrapper
interface and added a note to the mountd man page saying
hostnames will be ignored when they can not be looked up.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:25:16.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:26:27.000000000 -0500
@@ -46,7 +46,7 @@
#include <sys/signal.h>
#include <sys/queue.h>
#include <sys/stat.h>
-#include <unistd.h>
+#include <tcpd.h>
#include "xlog.h"
@@ -169,58 +169,15 @@ good_client(daemon, addr)
char *daemon;
struct sockaddr_in *addr;
{
- struct hostent *hp;
- char **sp;
- char *tmpname;
-
- /* First check the address. */
- if (hosts_ctl(daemon, "", inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
-
- /* Now do the hostname lookup */
- hp = gethostbyaddr ((const char *) &(addr->sin_addr),
- sizeof (addr->sin_addr), AF_INET);
- if (!hp) {
- xlog(L_WARNING,
- "Warning: Client IP address '%s' not found in host lookup",
- inet_ntoa(addr->sin_addr));
- return DENY; /* never heard of it. misconfigured DNS? */
- }
-
- /* Make sure the hostent is authorative. */
- tmpname = strdup(hp->h_name);
- if (!tmpname) {
- xlog(L_WARNING, "Warning: No memory for Host access check");
- return DENY;
- }
- hp = gethostbyname(tmpname);
- if (!hp) {
- xlog(L_WARNING,
- "Warning: Client hostname '%s' not found in host lookup", tmpname);
- free(tmpname);
- return DENY; /* never heard of it. misconfigured DNS? */
- }
- free(tmpname);
+ struct request_info req;
- /* Now make sure the address is on the list */
- for (sp = hp->h_addr_list ; *sp ; sp++) {
- if (memcmp(*sp, &(addr->sin_addr), hp->h_length) == 0)
- break;
- }
- if (!*sp)
- return DENY; /* it was a FAKE. */
+ request_init(&req, RQ_DAEMON, daemon, RQ_CLIENT_SIN, addr, 0);
+ sock_methods(&req);
- /* Check the official name and address. */
- if (hosts_ctl(daemon, hp->h_name, inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
-
- /* Now check aliases. */
- for (sp = hp->h_aliases; *sp ; sp++) {
- if (hosts_ctl(daemon, *sp, inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
- }
+ if (hosts_access(&req))
+ return ALLOW;
- return ALLOW;
+ return DENY;
}
/* check_startup - additional startup code */
diff -up nfs-utils-1.1.4/utils/mountd/mountd.man.orig nfs-utils-1.1.4/utils/mountd/mountd.man
--- nfs-utils-1.1.4/utils/mountd/mountd.man.orig 2008-10-17 10:20:09.000000000 -0400
+++ nfs-utils-1.1.4/utils/mountd/mountd.man 2009-01-31 06:26:27.000000000 -0500
@@ -181,13 +181,15 @@ mountd: .bar.com
You have to use the daemon name
.B mountd
for the daemon name (even if the binary has a different name).
+.B Note:
+hostnames used in either access file will be ignored when
+they can not be resolved into IP addresses.
For further information please have a look at the
.BR tcpd (8)
and
.BR hosts_access (5)
manual pages.
-
.SH SEE ALSO
.BR rpc.nfsd (8),
.BR exportfs (8),
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-10/nfs-utils.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- nfs-utils.spec 20 Jan 2009 12:06:23 -0000 1.199
+++ nfs-utils.spec 31 Jan 2009 11:53:14 -0000 1.200
@@ -2,7 +2,7 @@
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.1.4
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -30,7 +30,10 @@
Patch05: nfs-utils-1.1.4-tcpwrapper-update.patch
Patch06: nfs-utils-1.1.4-tcpwrap-warn.patch
Patch07: nfs-utils-1.1.4-gssd-verbosity.patch
-Patch08: nfs-utils-1.1.4-tcpwrap-rulecheck.patch
+Patch08: nfs-utils-1.1.4-tcpwrap-hash.patch
+Patch09: nfs-utils-1.1.4-tcpwrap-newrules.patch
+Patch10: nfs-utils-1.1.4-tcpwrap-cleanup.patch
+
%if %{enablefscache}
Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -90,6 +93,8 @@
%patch06 -p1
%patch07 -p1
%patch08 -p1
+%patch09 -p1
+%patch10 -p1
%if %{enablefscache}
%patch90 -p1
@@ -253,6 +258,10 @@
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Sat Jan 31 2009 Steve Dickson <steved(a)redhat.com> 1.1.4-8
+- Reworked tcp wrapper code to correctly use API (bz 480223)
+- General clean up of tcp wrapper code.
+
* Tue Jan 20 2009 Steve Dickson <steved(a)redhat.com> 1.1.4-7
- mountd: Don't do tcp wrapper check when there are no rules (bz 448898)
--- nfs-utils-1.1.4-tcpwrap-rulecheck.patch DELETED ---
14Â years
rpms/rpm/devel rpm.spec,1.319,1.320
by Panu Matilainen
Author: pmatilai
Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12745
Modified Files:
rpm.spec
Log Message:
- oops, db svc util is named differently in fedora
Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- rpm.spec 31 Jan 2009 11:36:08 -0000 1.319
+++ rpm.spec 31 Jan 2009 11:50:27 -0000 1.320
@@ -228,12 +228,14 @@
# plant links to db utils as rpmdb_foo so existing documantion is usable
%if %{without int_bdb}
+dbprefix=db45
for dbutil in \
archive deadlock dump load printlog \
- recover stat svc upgrade verify
+ recover stat upgrade verify
do
- ln -s ../../bin/db45_$dbutil $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_$dbutil
+ ln -s ../../bin/${dbprefix}_${dbutil} $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_${dbutil}
done
+ln -s ../../bin/berkeley_${dbprefix}_svc $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_svc
%endif
%find_lang %{name}
14Â years
rpms/beagle/F-10 beagle-0.3.9-spew.patch, NONE, 1.1 beagle.spec, 1.156, 1.157 beagle-0.3.2-spew.patch, 1.1, NONE
by drago01
Author: drago01
Update of /cvs/pkgs/rpms/beagle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12611
Modified Files:
beagle.spec
Added Files:
beagle-0.3.9-spew.patch
Removed Files:
beagle-0.3.2-spew.patch
Log Message:
Rebase debug output patch
beagle-0.3.9-spew.patch:
--- NEW FILE beagle-0.3.9-spew.patch ---
diff -upNr beagle-0.3.9.orign/beagled/BeagleDaemon.cs beagle-0.3.9/beagled/BeagleDaemon.cs
--- beagle-0.3.9.orign/beagled/BeagleDaemon.cs 2008-06-11 20:42:20.000000000 +0200
+++ beagle-0.3.9/beagled/BeagleDaemon.cs 2009-01-31 12:44:23.000000000 +0100
@@ -456,7 +456,7 @@ namespace Beagle.Daemon {
// debugging this code, after all...
// arg_debug ? LogLevel.Debug : LogLevel.Warn
- Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg);
+ Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg);
Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion);
Log.Always ("Command Line: {0}",
Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- beagle.spec 31 Jan 2009 11:24:31 -0000 1.156
+++ beagle.spec 31 Jan 2009 11:49:20 -0000 1.157
@@ -1,6 +1,6 @@
Name: beagle
Version: 0.3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Beagle Search Infrastructure
Group: User Interface/Desktops
# see COPYING for details
@@ -51,7 +51,7 @@
Requires(pre): shadow-utils >= 4.0.17-5
#Patch2: beagle-0.2.7-crawl.patch
-Patch3: beagle-0.3.2-spew.patch
+Patch3: beagle-0.3.9-spew.patch
Patch4: beagle-0.3.0-runuser.patch
Patch5: beagle-0.2.15.1-libdir.patch
Patch6: beagle-monodoc.patch
@@ -329,6 +329,9 @@
%{_libdir}/pkgconfig/beagle*.pc
%changelog
+* Sat Jan 31 2009 Adel Gadllah <adel.gadllah(a)gmail.com> - 0.3.9-2
+- Rebase debug output patch
+
* Sat Jan 31 2009 Adel Gadllah <adel.gadllah(a)gmail.com> - 0.3.9-1
- Update to 0.3.9
- Drop obsolete patches
--- beagle-0.3.2-spew.patch DELETED ---
14Â years
rpms/beagle/devel beagle-0.3.9-spew.patch, NONE, 1.1 beagle.spec, 1.159, 1.160 beagle-0.3.2-spew.patch, 1.1, NONE
by drago01
Author: drago01
Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12214
Modified Files:
beagle.spec
Added Files:
beagle-0.3.9-spew.patch
Removed Files:
beagle-0.3.2-spew.patch
Log Message:
Rebase debug output patch
beagle-0.3.9-spew.patch:
--- NEW FILE beagle-0.3.9-spew.patch ---
diff -upNr beagle-0.3.9.orign/beagled/BeagleDaemon.cs beagle-0.3.9/beagled/BeagleDaemon.cs
--- beagle-0.3.9.orign/beagled/BeagleDaemon.cs 2008-06-11 20:42:20.000000000 +0200
+++ beagle-0.3.9/beagled/BeagleDaemon.cs 2009-01-31 12:44:23.000000000 +0100
@@ -456,7 +456,7 @@ namespace Beagle.Daemon {
// debugging this code, after all...
// arg_debug ? LogLevel.Debug : LogLevel.Warn
- Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg);
+ Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg);
Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion);
Log.Always ("Command Line: {0}",
Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- beagle.spec 28 Jan 2009 12:03:15 -0000 1.159
+++ beagle.spec 31 Jan 2009 11:47:25 -0000 1.160
@@ -1,6 +1,6 @@
Name: beagle
Version: 0.3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Beagle Search Infrastructure
Group: User Interface/Desktops
# see COPYING for details
@@ -51,7 +51,7 @@
Requires(pre): shadow-utils >= 4.0.17-5
#Patch2: beagle-0.2.7-crawl.patch
-Patch3: beagle-0.3.2-spew.patch
+Patch3: beagle-0.3.9-spew.patch
Patch4: beagle-0.3.0-runuser.patch
Patch5: beagle-0.2.15.1-libdir.patch
Patch6: beagle-monodoc.patch
@@ -339,6 +339,9 @@
%{_libdir}/pkgconfig/beagle*.pc
%changelog
+* Sat Jan 31 2009 Adel Gadllah <adel.gadllah(a)gmail.com> - 0.3.9-2
+- Rebase debug output patch
+
* Wed Jan 28 2009 Adel Gadllah <adel.gadllah(a)gmail.com> - 0.3.9-1
- Update t 0.3.9
- Drop obsolete patches
--- beagle-0.3.2-spew.patch DELETED ---
14Â years
rpms/nfs-utils/devel nfs-utils-1.1.4-tcpwrap-cleanup.patch, NONE, 1.1 nfs-utils-1.1.4-tcpwrap-hash.patch, NONE, 1.1 nfs-utils-1.1.4-tcpwrap-newrules.patch, NONE, 1.1 nfs-utils.spec, 1.209, 1.210 nfs-utils-1.1.4-tcpwrap-rulecheck.patch, 1.1, NONE
by Steve Dickson
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11456
Modified Files:
nfs-utils.spec
Added Files:
nfs-utils-1.1.4-tcpwrap-cleanup.patch
nfs-utils-1.1.4-tcpwrap-hash.patch
nfs-utils-1.1.4-tcpwrap-newrules.patch
Removed Files:
nfs-utils-1.1.4-tcpwrap-rulecheck.patch
Log Message:
- Reworked tcp wrapper code to correctly use API (bz 480223)
- General clean up of tcp wrapper code.
nfs-utils-1.1.4-tcpwrap-cleanup.patch:
--- NEW FILE nfs-utils-1.1.4-tcpwrap-cleanup.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 06:17:18 2009 -0500
General clean up. Removed unused routines. Reworked syslog
message to (hopefully) make it more sensible. Move
"#ifdef HAVE_LIBWRAP" around so nothing will be defined
when tcp wrapper is not configured.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:27:54.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:31:32.000000000 -0500
@@ -34,6 +34,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#ifdef HAVE_LIBWRAP
#include <tcpwrapper.h>
#include <unistd.h>
#include <string.h>
@@ -57,40 +58,10 @@
static void logit(int severity, struct sockaddr_in *addr,
u_long procnum, u_long prognum, char *text);
-static void toggle_verboselog(int sig);
-int verboselog = 0;
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;
-
-/* A handful of macros for "readability". */
-
-#ifdef HAVE_LIBWRAP
-/* coming from libwrap.a (tcp_wrappers) */
-extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
-#else
-int hosts_ctl(char *daemon, char *name, char *addr, char *user)
-{
- return 0;
-}
-#endif
-
-#define legal_port(a,p) \
- (ntohs((a)->sin_port) < IPPORT_RESERVED || (p) >= IPPORT_RESERVED)
-
-#define log_bad_port(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from unprivileged port")
+static int check_files(void);
#define log_bad_host(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from unauthorized host")
-
-#define log_bad_owner(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request from non-local host")
-
-#define log_no_forward(addr, proc, prog) \
- logit(deny_severity, addr, proc, prog, ": request not forwarded")
-
-#define log_client(addr, proc, prog) \
- logit(allow_severity, addr, proc, prog, "")
+ logit(LOG_WARNING, addr, proc, prog, "request from unauthorized host")
#define ALLOW 1
#define DENY 0
@@ -180,46 +151,9 @@ struct sockaddr_in *addr;
return DENY;
}
-/* check_startup - additional startup code */
-
-void check_startup(void)
-{
-
- /*
- * Give up root privileges so that we can never allocate a privileged
- * port when forwarding an rpc request.
- *
- * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it,
- * switch to that uid, otherwise simply resue the old bin user and print
- * out a warning in syslog.
- */
-
- struct passwd *pwent;
-
- pwent = getpwnam("rpc");
- if (pwent == NULL) {
- syslog(LOG_WARNING, "user rpc not found, reverting to user bin");
- if (setuid(1) == -1) {
- syslog(LOG_ERR, "setuid(1) failed: %m");
- exit(1);
- }
- }
- else {
- if (setuid(pwent->pw_uid) == -1) {
- syslog(LOG_WARNING, "setuid() to rpc user failed: %m");
- if (setuid(1) == -1) {
- syslog(LOG_ERR, "setuid(1) failed: %m");
- exit(1);
- }
- }
- }
-
- (void) signal(SIGINT, toggle_verboselog);
-}
-
/* check_files - check to see if either access files have changed */
-int check_files()
+static int check_files()
{
static time_t allow_mtime, deny_mtime;
struct stat astat, dstat;
@@ -268,78 +202,21 @@ u_long prog;
haccess_add(addr, prog, FALSE);
return (FALSE);
}
- if (verboselog)
- log_client(addr, proc, prog);
if (acc)
acc->access = TRUE;
else
haccess_add(addr, prog, TRUE);
- return (TRUE);
-}
-/* check_privileged_port - additional checks for privileged-port updates */
-int
-check_privileged_port(struct sockaddr_in *addr,
- u_long proc, u_long prog, u_long port)
-{
-#ifdef CHECK_PORT
- if (!legal_port(addr, port)) {
- log_bad_port(addr, proc, prog);
- return (FALSE);
- }
-#endif
return (TRUE);
}
-/* toggle_verboselog - toggle verbose logging flag */
-
-static void toggle_verboselog(int sig)
-{
- (void) signal(sig, toggle_verboselog);
- verboselog = !verboselog;
-}
-
/* logit - report events of interest via the syslog daemon */
static void logit(int severity, struct sockaddr_in *addr,
u_long procnum, u_long prognum, char *text)
{
- char *procname;
- char procbuf[16 + 4 * sizeof(u_long)];
- char *progname;
- char progbuf[16 + 4 * sizeof(u_long)];
- struct rpcent *rpc;
-
- /*
- * Fork off a process or the portmap daemon might hang while
- * getrpcbynumber() or syslog() does its thing.
- *
- * Don't forget to wait for the children, too...
- */
-
- if (fork() == 0) {
-
- /* Try to map program number to name. */
-
- if (prognum == 0) {
- progname = "";
- } else if ((rpc = getrpcbynumber((int) prognum))) {
- progname = rpc->r_name;
- } else {
- snprintf(progname = progbuf, sizeof (progbuf),
- "prog (%lu)", prognum);
- }
-
- /* Try to map procedure number to name. */
-
- snprintf(procname = procbuf, sizeof (procbuf),
- "proc (%lu)", (u_long) procnum);
-
- /* Write syslog record. */
-
- syslog(severity, "connect from %s to %s in %s%s",
- inet_ntoa(addr->sin_addr), procname, progname, text);
- exit(0);
- }
+ syslog(severity, "connect from %s denied: %s",
+ inet_ntoa(addr->sin_addr), text);
}
+#endif
nfs-utils-1.1.4-tcpwrap-hash.patch:
--- NEW FILE nfs-utils-1.1.4-tcpwrap-hash.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 05:30:13 2009 -0500
Only hash on IP address and Program number. Including the Procedure
number only creates needles extra hash entries.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:22:35.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:23:22.000000000 -0500
@@ -106,8 +106,8 @@ typedef struct _hash_head {
TAILQ_HEAD(host_list, _haccess_t) h_head;
} hash_head;
hash_head haccess_tbl[HASH_TABLE_SIZE];
-static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long, u_long);
-static void haccess_add(struct sockaddr_in *addr, u_long, u_long, int);
+static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long);
+static void haccess_add(struct sockaddr_in *addr, u_long, int);
inline unsigned int strtoint(char *str)
{
@@ -124,11 +124,10 @@ inline int hashint(unsigned int num)
{
return num % HASH_TABLE_SIZE;
}
-#define HASH(_addr, _proc, _prog) \
- hashint((strtoint((_addr))+(_proc)+(_prog)))
+#define HASH(_addr, _prog) \
+ hashint((strtoint((_addr))+(_prog)))
-void haccess_add(struct sockaddr_in *addr, u_long proc,
- u_long prog, int access)
+void haccess_add(struct sockaddr_in *addr, u_long prog, int access)
{
hash_head *head;
haccess_t *hptr;
@@ -138,7 +137,7 @@ void haccess_add(struct sockaddr_in *add
if (hptr == NULL)
return;
- hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+ hash = HASH(inet_ntoa(addr->sin_addr), prog);
head = &(haccess_tbl[hash]);
hptr->access = access;
@@ -149,13 +148,13 @@ void haccess_add(struct sockaddr_in *add
else
TAILQ_INSERT_TAIL(&head->h_head, hptr, list);
}
-haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long proc, u_long prog)
+haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long prog)
{
hash_head *head;
haccess_t *hptr;
int hash;
- hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+ hash = HASH(inet_ntoa(addr->sin_addr), prog);
head = &(haccess_tbl[hash]);
TAILQ_FOREACH(hptr, &head->h_head, list) {
@@ -300,7 +299,7 @@ u_long prog;
haccess_t *acc = NULL;
int changed = check_files();
- acc = haccess_lookup(addr, proc, prog);
+ acc = haccess_lookup(addr, prog);
if (acc && changed == 0)
return (acc->access);
@@ -309,7 +308,7 @@ u_long prog;
if (acc)
acc->access = FALSE;
else
- haccess_add(addr, proc, prog, FALSE);
+ haccess_add(addr, prog, FALSE);
return (FALSE);
}
if (verboselog)
@@ -318,7 +317,7 @@ u_long prog;
if (acc)
acc->access = TRUE;
else
- haccess_add(addr, proc, prog, TRUE);
+ haccess_add(addr, prog, TRUE);
return (TRUE);
}
nfs-utils-1.1.4-tcpwrap-newrules.patch:
--- NEW FILE nfs-utils-1.1.4-tcpwrap-newrules.patch ---
Author: Steve Dickson <steved(a)redhat.com>
Date: Sat Jan 31 05:50:51 2009 -0500
Converted good_client() to correctly use the tcp wrapper
interface and added a note to the mountd man page saying
hostnames will be ignored when they can not be looked up.
Signed-off-by: Steve Dickson <steved(a)redhat.com>
diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig 2009-01-31 06:25:16.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c 2009-01-31 06:26:27.000000000 -0500
@@ -46,7 +46,7 @@
#include <sys/signal.h>
#include <sys/queue.h>
#include <sys/stat.h>
-#include <unistd.h>
+#include <tcpd.h>
#include "xlog.h"
@@ -169,58 +169,15 @@ good_client(daemon, addr)
char *daemon;
struct sockaddr_in *addr;
{
- struct hostent *hp;
- char **sp;
- char *tmpname;
-
- /* First check the address. */
- if (hosts_ctl(daemon, "", inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
-
- /* Now do the hostname lookup */
- hp = gethostbyaddr ((const char *) &(addr->sin_addr),
- sizeof (addr->sin_addr), AF_INET);
- if (!hp) {
- xlog(L_WARNING,
- "Warning: Client IP address '%s' not found in host lookup",
- inet_ntoa(addr->sin_addr));
- return DENY; /* never heard of it. misconfigured DNS? */
- }
-
- /* Make sure the hostent is authorative. */
- tmpname = strdup(hp->h_name);
- if (!tmpname) {
- xlog(L_WARNING, "Warning: No memory for Host access check");
- return DENY;
- }
- hp = gethostbyname(tmpname);
- if (!hp) {
- xlog(L_WARNING,
- "Warning: Client hostname '%s' not found in host lookup", tmpname);
- free(tmpname);
- return DENY; /* never heard of it. misconfigured DNS? */
- }
- free(tmpname);
+ struct request_info req;
- /* Now make sure the address is on the list */
- for (sp = hp->h_addr_list ; *sp ; sp++) {
- if (memcmp(*sp, &(addr->sin_addr), hp->h_length) == 0)
- break;
- }
- if (!*sp)
- return DENY; /* it was a FAKE. */
+ request_init(&req, RQ_DAEMON, daemon, RQ_CLIENT_SIN, addr, 0);
+ sock_methods(&req);
- /* Check the official name and address. */
- if (hosts_ctl(daemon, hp->h_name, inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
-
- /* Now check aliases. */
- for (sp = hp->h_aliases; *sp ; sp++) {
- if (hosts_ctl(daemon, *sp, inet_ntoa(addr->sin_addr), "") == DENY)
- return DENY;
- }
+ if (hosts_access(&req))
+ return ALLOW;
- return ALLOW;
+ return DENY;
}
/* check_startup - additional startup code */
diff -up nfs-utils-1.1.4/utils/mountd/mountd.man.orig nfs-utils-1.1.4/utils/mountd/mountd.man
--- nfs-utils-1.1.4/utils/mountd/mountd.man.orig 2008-10-17 10:20:09.000000000 -0400
+++ nfs-utils-1.1.4/utils/mountd/mountd.man 2009-01-31 06:26:27.000000000 -0500
@@ -181,13 +181,15 @@ mountd: .bar.com
You have to use the daemon name
.B mountd
for the daemon name (even if the binary has a different name).
+.B Note:
+hostnames used in either access file will be ignored when
+they can not be resolved into IP addresses.
For further information please have a look at the
.BR tcpd (8)
and
.BR hosts_access (5)
manual pages.
-
.SH SEE ALSO
.BR rpc.nfsd (8),
.BR exportfs (8),
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- nfs-utils.spec 27 Jan 2009 23:02:49 -0000 1.209
+++ nfs-utils.spec 31 Jan 2009 11:42:01 -0000 1.210
@@ -2,7 +2,7 @@
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.1.4
-Release: 14%{?dist}
+Release: 15%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -44,8 +44,10 @@
Patch115: nfs-utils-1.1.4-mount-addrconfig.patch
Patch116: nfs-utils-1.1.4-configure-uuid.patch
Patch117: nfs-utils-1.1.4-configure-tirpc.patch
-Patch118: nfs-utils-1.1.4-tcpwrap-rulecheck.patch
-Patch119: nfs-utils-1.1.4-mount-textbased.patch
+Patch118: nfs-utils-1.1.4-tcpwrap-hash.patch
+Patch119: nfs-utils-1.1.4-tcpwrap-newrules.patch
+Patch120: nfs-utils-1.1.4-tcpwrap-cleanup.patch
+Patch121: nfs-utils-1.1.4-mount-textbased.patch
%if %{enablefscache}
Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -120,6 +122,8 @@
%patch117 -p1
%patch118 -p1
%patch119 -p1
+%patch120 -p1
+%patch121 -p1
%if %{enablefscache}
%patch90 -p1
@@ -283,6 +287,10 @@
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Sat Jan 31 2009 Steve Dickson <steved(a)redhat.com> 1.1.4-15
+- Reworked tcp wrapper code to correctly use API (bz 480223)
+- General clean up of tcp wrapper code.
+
* Tue Jan 27 2009 Steve Dickson <steved(a)redhat.com> 1.1.4-14
- text-based mount command: make po_rightmost() work for N options
- text-based mount command: Function to stuff "struct pmap" from mount options
--- nfs-utils-1.1.4-tcpwrap-rulecheck.patch DELETED ---
14Â years
rpms/rpm/devel rpm.spec,1.318,1.319
by Panu Matilainen
Author: pmatilai
Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10731
Modified Files:
rpm.spec
Log Message:
- change platform sharedstatedir to something more sensible (#185862)
- add rpmdb_foo links to db utils for documentation compatibility
Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- rpm.spec 30 Jan 2009 11:28:35 -0000 1.318
+++ rpm.spec 31 Jan 2009 11:36:08 -0000 1.319
@@ -18,7 +18,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: 0.%{snapver}.1%{?dist}
+Release: 0.%{snapver}.2%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -42,7 +42,8 @@
Requires(post): coreutils
%if %{without int_bdb}
-Requires(post): compat-db45
+# normally db4-utils = %{bdbver} for the rpmdb_foo symlinks
+Requires: compat-db45
%endif
Requires: popt >= 1.10.2.1
Requires: crontabs
@@ -190,6 +191,7 @@
--prefix=%{_usr} \
--sysconfdir=%{_sysconfdir} \
--localstatedir=%{_var} \
+ --sharedstatedir=%{_var}/lib \
--libdir=%{_libdir} \
%{!?with_int_bdb: --with-external-db} \
%{?with_sqlite: --enable-sqlite3} \
@@ -224,6 +226,16 @@
touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi
done
+# plant links to db utils as rpmdb_foo so existing documantion is usable
+%if %{without int_bdb}
+for dbutil in \
+ archive deadlock dump load printlog \
+ recover stat svc upgrade verify
+do
+ ln -s ../../bin/db45_$dbutil $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_$dbutil
+done
+%endif
+
%find_lang %{name}
find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f
@@ -239,11 +251,7 @@
%posttrans
# XXX this is klunky and ugly, rpm itself should handle this
-%if %{with int_bdb}
dbstat=/usr/lib/rpm/rpmdb_stat
-%else
-dbstat=%{_bindir}/db45_stat
-%endif
if [ -x "$dbstat" ]; then
if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match environment version \| Invalid argument"; then
rm -f /var/lib/rpm/__db.*
@@ -357,6 +365,10 @@
%doc doc/librpm/html/*
%changelog
+* Sat Jan 31 2009 Panu Matilainen <pmatilai(a)redhat.com>
+- change platform sharedstatedir to something more sensible (#185862)
+- add rpmdb_foo links to db utils for documentation compatibility
+
* Fri Jan 30 2009 Panu Matilainen <pmatilai(a)redhat.com> - 4.6.0-0.rc4.1
- update to 4.6.0-rc4
- fixes #475582, #478907, #476737, #479869, #476201
14Â years