upgrading package: sudosh 1.8.2 -> 1.0.2

sudosh/sudosh.patch

@@ -1,7 +1,7 @@
 Index: src/Makefile.in
---- src/Makefile.in.orig	2005-06-13 04:33:29 +0200
-+++ src/Makefile.in	2007-12-28 10:43:39 +0100
-@@ -427,7 +427,7 @@
+--- src/Makefile.in.orig	2008-02-22 22:11:01 +0100
++++ src/Makefile.in	2010-01-24 21:56:44 +0100
+@@ -442,7 +442,7 @@
  
  install-sudosh.conf:
  	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
@@ -11,8 +11,8 @@ Index: src/Makefile.in
  install: install-am install-sudosh.conf
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
 Index: src/getopt.c
---- src/getopt.c.orig	2005-06-13 01:22:42 +0200
-+++ src/getopt.c	2007-12-28 10:43:39 +0100
+--- src/getopt.c.orig	2007-12-21 22:03:26 +0100
++++ src/getopt.c	2010-01-24 21:56:44 +0100
 @@ -37,6 +37,8 @@
  #include "config.h"
  #endif
@@ -23,31 +23,21 @@ Index: src/getopt.c
  /* This is a separate conditional since some stdc systems
     reject `defined (const)'.  */
 Index: src/parse.c
---- src/parse.c.orig	2005-06-13 01:22:42 +0200
-+++ src/parse.c	2007-12-28 10:43:39 +0100
-@@ -19,7 +19,8 @@
- void parse(option * o, const char *file)
+--- src/parse.c.orig	2008-02-22 22:07:45 +0100
++++ src/parse.c	2010-01-24 21:57:41 +0100
+@@ -7,7 +7,8 @@
+ void parse(option * c, const char *file)
  {
-     FILE *f = fopen(file, "r");
+     FILE *f;
 -    unsigned int line_number, i;
 +    unsigned int line_number;
 +    int i;
      char line[BUFSIZ];
-     char *arg, *cmt, *opt;
-     config *scan;
-@@ -38,6 +39,9 @@
- 	while (isspace(*opt))
- 	    opt++;
- 
-+	if (strlen(opt)==0)
-+		continue;
-+
- 	for (i = strlen(opt) - 1; i >= 0 && isspace(opt[i]); i--)
- 	    opt[i] = '\0';
- 
+ 	int leftside;
+     char key[BUFSIZ], value[BUFSIZ];
 Index: src/sudosh.c
---- src/sudosh.c.orig	2005-06-13 04:35:07 +0200
-+++ src/sudosh.c	2007-12-28 10:43:39 +0100
+--- src/sudosh.c.orig	2008-02-25 21:29:12 +0100
++++ src/sudosh.c	2010-01-24 21:56:44 +0100
 @@ -28,6 +28,13 @@
  
  #define WRITE(a, b, c) do_write(a, b, c, __FILE__, __LINE__)
@@ -62,7 +52,7 @@ Index: src/sudosh.c
  static struct termios termorig;
  static struct winsize winorig;
  
-@@ -545,19 +552,43 @@
+@@ -507,19 +514,43 @@
  {
    char *sname;
  
@@ -106,7 +96,7 @@ Index: src/sudosh.c
  
    if ((p->sfd = open (sname, O_RDWR)) == -1)
      {
-@@ -619,9 +650,14 @@
+@@ -581,9 +612,14 @@
    for (i = 3; i < 100; ++i)
      close (i);
  
@@ -121,7 +111,7 @@ Index: src/sudosh.c
    (void) ioctl (0, TIOCSWINSZ, &winorig);
  
    setuid (getuid ());
-@@ -663,6 +699,13 @@
+@@ -629,6 +665,13 @@
  {
    static struct termios termnew;
  
@@ -135,7 +125,7 @@ Index: src/sudosh.c
  #ifdef TCGETS
    if (ioctl (ttyfd, TCGETS, &termorig) == -1)
      {
-@@ -670,6 +713,7 @@
+@@ -636,6 +679,7 @@
        exit (EXIT_FAILURE);
      }
  #endif
@@ -143,7 +133,7 @@ Index: src/sudosh.c
  
    if (ioctl (ttyfd, TIOCGWINSZ, &winorig) == -1)
      {
-@@ -677,6 +721,11 @@
+@@ -643,6 +687,11 @@
        exit (EXIT_FAILURE);
      }
  
@@ -155,7 +145,7 @@ Index: src/sudosh.c
    termnew.c_cc[VEOF] = 1;
    termnew.c_iflag = BRKINT | ISTRIP | IXON | IXANY;
    termnew.c_oflag = 0;
-@@ -686,14 +735,20 @@
+@@ -652,14 +701,20 @@
  #ifdef TCSETS
    (void) ioctl (ttyfd, TCSETS, &termnew);
  #endif

sudosh/sudosh.spec

@@ -24,21 +24,21 @@
 #   package information
 Name:         sudosh
 Summary:      SUDO Shell
-URL:          http://sudosh.sourceforge.net/
+URL:          http://sudosh2.sourceforge.net/
 Vendor:       Douglas Richard Hanks, Jr.
 Packager:     OpenPKG Foundation e.V.
 Distribution: OpenPKG Community
 Class:        EVAL
 Group:        ShellUtils
 License:      Open Software License
-Version:      1.8.2
-Release:      20100110
+Version:      1.0.2
+Release:      20100124
 
 #   package options
 %option       with_fsl  yes
 
 #   list of sources
-Source0:      http://sudosh.sourceforge.net/sudosh-%{version}.tar.bz2
+Source0:      http://switch.dl.sourceforge.net/sudosh2/sudosh2-%{version}.tbz2
 Source1:      sudosh.conf
 Source2:      fsl.sudosh
 Source3:      rc.sudosh
@@ -68,14 +68,13 @@ AutoReqProv:  no
 
 %track
     prog sudosh = {
-        comment   = "rse: versions have disappeared from the net?"
         version   = %{version}
-        url       = http://sudosh.sourceforge.net/
-        regex     = sudosh-(__VER__)\.tar\.bz2
+        url       = http://sourceforge.net/projects/sudosh2/files/
+        regex     = sudosh2-(__VER__)\.tbz2
     }
 
 %prep
-    %setup -q
+    %setup -q -n sudosh2-%{version}
     %patch -p0
 
 %build
@@ -90,6 +89,7 @@ AutoReqProv:  no
     esac
     ./configure \
         --prefix=%{l_prefix} \
+        --mandir=%{l_prefix}/man \
         --sysconfdir=%{l_prefix}/etc/sudosh \
         --with-logdir=%{l_prefix}/var/sudosh
 
@@ -102,6 +102,7 @@ AutoReqProv:  no
     %{l_make} %{l_mflags} install \
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
+        mandir=$RPM_BUILD_ROOT%{l_prefix}/man \
         sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/sudosh
 
     #   strip down installation files