Hello community,
here is the log from the commit of package linux_pcnfsd2 for openSUSE:Factory
checked in at Wed May 5 23:14:55 CEST 2010.
--------
--- linux_pcnfsd2/linux_pcnfsd2.changes 2009-11-23 17:40:10.000000000 +0100
+++ linux_pcnfsd2/linux_pcnfsd2.changes 2010-05-05 14:00:39.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 5 12:02:27 CEST 2010 - meissner@suse.de
+
+- fixed some implicit warnings
+- rely on the portmap requires, do not check
+ for portmap in the initscript (as it was renamed).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linux_pcnfsd2.spec ++++++
--- /var/tmp/diff_new_pack.KS1GjI/_old 2010-05-05 23:13:47.000000000 +0200
+++ /var/tmp/diff_new_pack.KS1GjI/_new 2010-05-05 23:13:47.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package linux_pcnfsd2 (Version 1.6)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
Requires: net-tools netcfg
AutoReqProv: on
Version: 1.6
-Release: 637
+Release: 638
Summary: RPC Server That Supports ONC Clients
Source: linux_pcnfsd2.tar.gz
Source1: pcnfsd
++++++ linux_pcnfsd2.dif ++++++
--- /var/tmp/diff_new_pack.KS1GjI/_old 2010-05-05 23:13:47.000000000 +0200
+++ /var/tmp/diff_new_pack.KS1GjI/_new 2010-05-05 23:13:47.000000000 +0200
@@ -38,16 +38,23 @@
===================================================================
--- pcnfsd_misc.c.orig
+++ pcnfsd_misc.c
-@@ -18,6 +18,8 @@
+@@ -18,10 +18,15 @@
#include "pcnfsd.h"
#include
+#include
+#include
#include
++#include
#include
#include
-@@ -29,6 +31,7 @@
+ #include
++#include
++#include
+ #include
+ #include
+ #include
+@@ -29,6 +34,7 @@
#include
#include
#include
@@ -55,7 +62,7 @@
#ifdef ISC_2_0
#include
-@@ -48,7 +51,7 @@ extern char *getusershell();
+@@ -48,7 +54,7 @@ extern char *getusershell();
/*
**---------------------------------------------------------------------
@@ -64,7 +71,7 @@
**---------------------------------------------------------------------
*/
-@@ -68,7 +71,7 @@ int uidrhi[NUMUIDS];
+@@ -68,7 +74,7 @@ int uidrhi[NUMUIDS];
*/
/*
**---------------------------------------------------------------------
@@ -73,7 +80,7 @@
**---------------------------------------------------------------------
*/
-@@ -114,8 +117,13 @@ char *r;
+@@ -114,8 +120,13 @@ char *r;
int suspicious (s)
char *s;
{
@@ -89,7 +96,7 @@
return 0;
}
-@@ -124,7 +132,7 @@ scramble(s1, s2)
+@@ -124,7 +135,7 @@ scramble(s1, s2)
char *s1;
char *s2;
{
@@ -98,7 +105,7 @@
{
*s2++ = (*s1 ^ zchar) & 0x7f;
s1++;
-@@ -212,6 +220,7 @@ long expday;
+@@ -212,6 +223,7 @@ long expday;
#endif
#ifdef SHADOW_SUPPORT
@@ -106,7 +113,7 @@
/*
**--------------------------------------------------------------
** Check the existence of SHADOW. If it is there, then we are
-@@ -231,7 +240,7 @@ long expday;
+@@ -231,7 +243,7 @@ long expday;
(shadowfile && (sp = getspnam(usrnam)) == (struct spwd *)NULL))
return ((struct passwd *)NULL);
@@ -115,7 +122,7 @@
{
/*
* New - check password expiry situation
-@@ -271,10 +280,22 @@ long expday;
+@@ -271,10 +283,22 @@ long expday;
}
pswd = sp->sp_pwdp;
(void) endspent();
@@ -139,7 +146,7 @@
#else
p = getpwnam(usrnam);
if (p == (struct passwd *)NULL)
-@@ -283,12 +304,12 @@ long expday;
+@@ -283,12 +307,12 @@ long expday;
#endif
#ifdef ISC_2_0
@@ -154,7 +161,7 @@
{
struct spwd *shadow = getspnam(usrnam);
-@@ -340,7 +361,7 @@ long expday;
+@@ -340,7 +364,7 @@ long expday;
/*
**---------------------------------------------------------------------
@@ -163,7 +170,7 @@
**---------------------------------------------------------------------
*/
-@@ -440,7 +461,7 @@ run_ps630(f, opts)
+@@ -440,7 +464,7 @@ run_ps630(f, opts)
/*
**---------------------------------------------------------------------
@@ -172,7 +179,7 @@
**---------------------------------------------------------------------
*/
-@@ -480,7 +501,8 @@ extern char *getcallername();
+@@ -480,7 +504,8 @@ extern char *getcallername();
#else SVR4
#include
@@ -182,7 +189,7 @@
void
wlogin(name)
-@@ -509,7 +531,7 @@ extern char *getcallername();
+@@ -509,7 +534,7 @@ extern char *getcallername();
/*
**---------------------------------------------------------------------
@@ -191,7 +198,7 @@
**---------------------------------------------------------------------
*/
-@@ -644,8 +666,14 @@ su_popen(user, cmd, maxtime)
+@@ -644,8 +669,14 @@ su_popen(user, cmd, maxtime)
}
dup2(1, 2); /* let's get stderr as well */
@@ -208,7 +215,7 @@
(void) execl("/bin/sh", "sh", "-c", cmd, (char *) NULL);
_exit(255);
-@@ -737,7 +765,7 @@ char *arg2;
+@@ -737,7 +768,7 @@ char *arg2;
wtmp_enabled = 0;;
continue;
}
@@ -297,7 +304,7 @@
===================================================================
--- pcnfsd_svc.c.orig
+++ pcnfsd_svc.c
-@@ -10,6 +10,7 @@
+@@ -10,10 +10,12 @@
#include "common.h"
#include
@@ -305,3 +312,8 @@
#include
#include
#include
+ #include
++#include
+
+ /* The following changes for Ultrix 4.2 were suggested by various users */
+ #ifndef ULTRIX
++++++ pcnfsd ++++++
--- /var/tmp/diff_new_pack.KS1GjI/_old 2010-05-05 23:13:48.000000000 +0200
+++ /var/tmp/diff_new_pack.KS1GjI/_new 2010-05-05 23:13:48.000000000 +0200
@@ -15,7 +15,8 @@
# Required-Start: $remote_fs $portmap $syslog
# Required-Stop: $remote_fs $portmap $syslog
# Default-Start: 3 5
-# Default-Stop:
+# Default-Stop: 0 1 2 4 6
+# Short-Description: PC NFS server
# Description: PC NFS server
### END INIT INFO
@@ -26,12 +27,6 @@
test -r $PCNFSD_SYSCONFIG || exit 6
. $PCNFSD_SYSCONFIG
-if test -x /sbin/portmap ; then
- PORTMAP=/sbin/portmap
-else
- PORTMAP=/usr/sbin/portmap
-fi
-
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
@@ -62,11 +57,6 @@
case "$1" in
start)
- checkproc $PORTMAP
- if test $? -ne 0 ; then
- echo -n "Starting PCNFS daemon requires portmapper $rc_failed"
- exit 1
- fi
echo -n "Starting PCNFS daemon"
## Start daemon with startproc(8). If this fails
## the echo return value is set appropriate.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
