commit linux_pcnfsd2 for openSUSE:Factory

25 Nov 2009

Hello community,

here is the log from the commit of package linux_pcnfsd2 for openSUSE:Factory
checked in at Wed Nov 25 16:12:35 CET 2009.



--------

--- linux_pcnfsd2/linux_pcnfsd2.changes	2008-08-28 01:40:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/linux_pcnfsd2/linux_pcnfsd2.changes	2009-11-23 17:40:10.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 23 17:06:04 CET 2009 - meissner@suse.de
+
+- fixed some implicit warnings
+- portmap -> $portmap
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ linux_pcnfsd2.spec ++++++
--- /var/tmp/diff_new_pack.HwwblR/_old	2009-11-25 16:11:35.000000000 +0100
+++ /var/tmp/diff_new_pack.HwwblR/_new	2009-11-25 16:11:35.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package linux_pcnfsd2 (Version 1.6)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -20,13 +20,13 @@
 
 Name:           linux_pcnfsd2
 #!BuildIgnore: nkitb
-License:        Any permissive
+License:        PERMISSIVE-OSI-COMPLIANT
 Group:          Productivity/Networking/NFS
 PreReq:         %insserv_prereq %fillup_prereq
 Requires:       net-tools netcfg
 AutoReqProv:    on
 Version:        1.6
-Release:        630
+Release:        637
 Summary:        RPC Server That Supports ONC Clients
 Source:         linux_pcnfsd2.tar.gz
 Source1:        pcnfsd
@@ -63,13 +63,13 @@
 ln -sf ../../etc/init.d/pcnfsd $RPM_BUILD_ROOT/usr/sbin/rcpcnfsd
 
 %post
-%{fillup_and_insserv -n pcnfsd pcnfsd}
+%{fillup_and_insserv pcnfsd}
 
 %preun
-%stop_on_removal -n pcnfsd pcnfsd}
+%stop_on_removal pcnfsd}
 
 %postun
-%restart_on_update -n pcnfsd pcnfsd
+%restart_on_update pcnfsd
 %{insserv_cleanup}
 
 %clean

++++++ linux_pcnfsd2.dif ++++++
--- /var/tmp/diff_new_pack.HwwblR/_old	2009-11-25 16:11:35.000000000 +0100
+++ /var/tmp/diff_new_pack.HwwblR/_new	2009-11-25 16:11:35.000000000 +0100
@@ -1,6 +1,8 @@
---- Makefile.linux
+Index: Makefile.linux
+===================================================================
+--- Makefile.linux.orig
 +++ Makefile.linux
-@@ -40,13 +40,14 @@
+@@ -40,13 +40,14 @@ HDRS= pcnfsd.h common.h
  
  LINTFLAGS= -hbax
  # uncomment as appropriate for debugging
@@ -19,7 +21,9 @@
  
  linux/pcnfsd_svc.o: $(HDRS) pcnfsd_svc.c
  	$(CC)  -c $(CFLAGS) -o $@ pcnfsd_svc.c
---- common.h
+Index: common.h
+===================================================================
+--- common.h.orig
 +++ common.h
 @@ -67,7 +67,7 @@
  **---------------------------------------------------------------------
@@ -30,9 +34,20 @@
  
  /*
  **---------------------------------------------------------------------
---- pcnfsd_misc.c
+Index: pcnfsd_misc.c
+===================================================================
+--- pcnfsd_misc.c.orig
 +++ pcnfsd_misc.c
-@@ -29,6 +29,7 @@
+@@ -18,6 +18,8 @@
+ #include "pcnfsd.h"
+ 
+ #include <stdio.h>
++#include <unistd.h>
++#include <stdlib.h>
+ #include <pwd.h>
+ #include <sys/file.h>
+ #include <signal.h>
+@@ -29,6 +31,7 @@
  #include <string.h>
  #include <memory.h>
  #include <ctype.h>
@@ -40,7 +55,7 @@
  
  #ifdef ISC_2_0
  #include <sys/fcntl.h>
-@@ -48,7 +49,7 @@
+@@ -48,7 +51,7 @@ extern char *getusershell();
  
  /*
  **---------------------------------------------------------------------
@@ -49,7 +64,7 @@
  **---------------------------------------------------------------------
  */
  
-@@ -68,7 +69,7 @@
+@@ -68,7 +71,7 @@ int		uidrhi[NUMUIDS];
  */
  /*
  **---------------------------------------------------------------------
@@ -58,7 +73,7 @@
  **---------------------------------------------------------------------
  */
  
-@@ -114,8 +115,13 @@
+@@ -114,8 +117,13 @@ char *r;
  int suspicious (s)
  char *s;
  {
@@ -74,7 +89,7 @@
  	return 0;
  }
  
-@@ -124,7 +130,7 @@
+@@ -124,7 +132,7 @@ scramble(s1, s2)
  char           *s1;
  char           *s2;
  {
@@ -83,7 +98,7 @@
  	      {
  	      *s2++ = (*s1 ^ zchar) & 0x7f;
  	      s1++;
-@@ -212,6 +218,7 @@
+@@ -212,6 +220,7 @@ long		expday;
  #endif
  
  #ifdef SHADOW_SUPPORT
@@ -91,7 +106,7 @@
  	/*
          **--------------------------------------------------------------
  	** Check the existence of SHADOW.  If it is there, then we are
-@@ -231,7 +238,7 @@
+@@ -231,7 +240,7 @@ long		expday;
  	   (shadowfile && (sp = getspnam(usrnam)) == (struct spwd *)NULL))
  	return ((struct passwd *)NULL);
  
@@ -100,7 +115,7 @@
             {
  /*
   * New - check password expiry situation
-@@ -271,10 +278,22 @@
+@@ -271,10 +280,22 @@ long		expday;
  		}
  	   pswd = sp->sp_pwdp;
  	   (void) endspent();
@@ -113,10 +128,10 @@
 +	if (p == (struct passwd *)NULL)
 +		return ((struct passwd *)NULL);
 +	endpwent();
-+
+ 
 +	sp = getspnam(p->pw_name);
 +	endspent();
- 
++
 +	if (sp)
 +		pswd = sp->sp_pwdp;
 +	else
@@ -124,7 +139,7 @@
  #else
  	p = getpwnam(usrnam);
  	if (p == (struct passwd *)NULL)
-@@ -283,12 +302,12 @@
+@@ -283,12 +304,12 @@ long		expday;
  #endif
  
  #ifdef ISC_2_0
@@ -139,7 +154,7 @@
  	   {
  	   struct spwd    *shadow = getspnam(usrnam);
  
-@@ -340,7 +359,7 @@
+@@ -340,7 +361,7 @@ long		expday;
  
  /*
  **---------------------------------------------------------------------
@@ -148,7 +163,7 @@
  **---------------------------------------------------------------------
  */
  
-@@ -440,7 +459,7 @@
+@@ -440,7 +461,7 @@ run_ps630(f, opts)
  
  /*
  **---------------------------------------------------------------------
@@ -157,7 +172,7 @@
  **---------------------------------------------------------------------
  */
  
-@@ -480,7 +499,8 @@
+@@ -480,7 +501,8 @@ extern char *getcallername();
  #else SVR4
  
  #include <utmp.h>
@@ -167,7 +182,7 @@
  
  void
  wlogin(name)
-@@ -509,7 +529,7 @@
+@@ -509,7 +531,7 @@ extern char *getcallername();
  
  /*
  **---------------------------------------------------------------------
@@ -176,7 +191,24 @@
  **---------------------------------------------------------------------
  */
  
-@@ -737,7 +757,7 @@
+@@ -644,8 +666,14 @@ su_popen(user, cmd, maxtime)
+ 		}
+ 		dup2(1, 2);	/* let's get stderr as well */
+ 
+-		(void) setgid(cached_gid);
+-		(void) setuid(cached_uid);
++		if (-1 == setgid(cached_gid)) {
++			perror ("setgid");
++			exit(1);
++		}
++		if (-1 == setuid(cached_uid)) {
++			perror ("setuid");
++			exit(1);
++		}
+ 
+ 		(void) execl("/bin/sh", "sh", "-c", cmd, (char *) NULL);
+ 		_exit(255);
+@@ -737,7 +765,7 @@ char *arg2;
  				wtmp_enabled = 0;;
  			continue;
  		}
@@ -185,9 +217,19 @@
  		if(!mystrcasecmp(kw, "printer")) {
  			arg1 = strtok(NULL, " \t");
  			arg2 = (arg1 == NULL ? NULL : strtok(NULL, ""));
---- pcnfsd_print.c
+Index: pcnfsd_print.c
+===================================================================
+--- pcnfsd_print.c.orig
 +++ pcnfsd_print.c
-@@ -96,7 +96,7 @@
+@@ -17,6 +17,7 @@
+ */
+ #include "pcnfsd.h"
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <stdio.h>
+ #include <pwd.h>
+ #include <ctype.h>
+@@ -96,7 +97,7 @@ struct stat     statbuf;
  char            pathname[MAXPATHLEN];
  char            new_pathname[MAXPATHLEN];
  char            sp_name[MAXPATHLEN] = SPOOLDIR;
@@ -196,7 +238,7 @@
  char            delims[] = " \t\r\n:()";
  
  pr_list         printers = NULL;
-@@ -219,8 +219,11 @@
+@@ -219,8 +220,11 @@ char *sys;
  char *pr;
  char**sp;
  {
@@ -210,7 +252,7 @@
  
  	*sp = &pathname[0];
  	pathname[0] = '\0';
-@@ -230,12 +233,19 @@
+@@ -230,12 +234,19 @@ int rc;
  
  	/* get pathname of current directory and return to client */
  
@@ -233,7 +275,7 @@
  	   (stat(pathname, &statbuf) != 0) ||
  	   !(statbuf.st_mode & S_IFDIR)) {
  	   (void)sprintf(tempstr,
-@@ -395,7 +405,7 @@
+@@ -395,7 +406,7 @@ int failed = 0;
  	        */
  		if(!xcmd) {
  #ifdef BSD_STYLE_PRINT
@@ -242,7 +284,7 @@
  			sprintf(cmdbuf, "/usr/bin/lpr -P%s -C%s -J%s %s",
  				pr, system, user, new_pathname);
  #else
-@@ -1487,7 +1497,7 @@
+@@ -1487,7 +1498,7 @@ struct {
  char default_cmd[] = "lp $FILE";
  #endif SVR4_STYLE_PRINT
  #ifdef BSD_STYLE_PRINT
@@ -251,3 +293,15 @@
  char default_cmd[] = "/usr/bin/lpr $FILE";
  #else
  char default_cmd[] = "/usr/ucb/lpr $FILE";
+Index: pcnfsd_svc.c
+===================================================================
+--- pcnfsd_svc.c.orig
++++ pcnfsd_svc.c
+@@ -10,6 +10,7 @@
+ #include "common.h"
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #include <rpc/rpc.h>
+ #include <signal.h>
+ #include <sys/socket.h>

++++++ pcnfsd ++++++
--- /var/tmp/diff_new_pack.HwwblR/_old	2009-11-25 16:11:35.000000000 +0100
+++ /var/tmp/diff_new_pack.HwwblR/_new	2009-11-25 16:11:35.000000000 +0100
@@ -12,8 +12,8 @@
 #
 ### BEGIN INIT INFO
 # Provides:          pcnfsd
-# Required-Start:    $remote_fs portmap $syslog
-# Required-Stop:     $remote_fs portmap $syslog
+# Required-Start:    $remote_fs $portmap $syslog
+# Required-Stop:     $remote_fs $portmap $syslog
 # Default-Start:     3 5
 # Default-Stop:
 # Description:       PC NFS server


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit linux_pcnfsd2 for openSUSE:Factory

root＠Hilbert.suse.de