Horst von Brand's security and specfile patches.

svn path=/trunk/; revision=2956

5 files changed, 12 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index c6c6630c..881c567f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,13 +2,15 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+* Horst Von Brand's security and specfile patches.
+
 fetchmail-5.5.1 (Sun Aug 20 23:43:03 EDT 2000), 19241 lines:
 
 * Fix a finger error in the dot-termination fix for 5.5.0.
 * Javier Kohen's update for es.po.
 * Jiri Pavlovsky's cs.po update.
 * Added to FAQ item on K3 a recipe using the new plugin %h option.
-* Fixed a nasty typo in FAQ item T1 -- the old version disdn't generate 
+* Fixed a nasty typo in FAQ item T1 -- the old version didn't generate 
   correct Delivered-To hacks.  Thanks to "Peter 'Rattacresh' Backes" 
   <rtc@helen.PLASMA.Xg8.DE> for spotting this.
 
diff --git a/daemon.c b/daemon.c
index a12f2c70..10c52b66 100644
--- a/daemon.c
+++ b/daemon.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
+#include <string.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
diff --git a/getpass.c b/getpass.c
index f89f32aa..b0858a23 100644
--- a/getpass.c
+++ b/getpass.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <stdlib.h>
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
diff --git a/imap.c b/imap.c
index 1f8d7cba..0654bdeb 100644
--- a/imap.c
+++ b/imap.c
@@ -315,7 +315,7 @@ static int do_rfc1731(int sock, char *truename)
 
     memcpy(session, credentials.session, sizeof session);
     memset(&credentials, 0, sizeof credentials);
-    des_key_sched(&session, schedule);
+    des_key_sched(session, schedule);
 
     result = krb_get_tf_fullname(TKT_FILE, tktuser, tktinst, tktrealm);
     if (result) {
diff --git a/specgen.sh b/specgen.sh
index f190ac92..4393a8a7 100755
--- a/specgen.sh
+++ b/specgen.sh
@@ -117,20 +117,20 @@ GUI konfigurator do fetchmaila napisany w pythonie.
 %build
 CFLAGS="\$RPM_OPT_FLAGS" LDFLAGS="-s"
 export CFLAGS LDFLAGS
-./configure --prefix=/usr # Add  --enable-nls --without-included-gettext
+./configure --prefix=/usr --mandir=%{_mandir} 
+                         # Add  --enable-nls --without-included-gettext
                          # for internationalization. Also look below.
-make
+make "LOADLIBS=-lkrb4 -ldes425 -lcrypt -lresolv -lkrb5 -lcom_err -lfl"
 
 %install
 if [ -d \$RPM_BUILD_ROOT ]; then rm -rf \$RPM_BUILD_ROOT; fi
 mkdir -p \$RPM_BUILD_ROOT/{etc/X11/wmconfig,usr/lib/rhs/control-panel}
-make install prefix=\$RPM_BUILD_ROOT/usr
+make install prefix=\$RPM_BUILD_ROOT/usr mandir=\$RPM_BUILD_ROOT%{_mandir}/man1
 cp rh-config/*.{xpm,init} \$RPM_BUILD_ROOT/usr/lib/rhs/control-panel
-cp fetchmail.man \$RPM_BUILD_ROOT/usr/man/man1/fetchmail.1
 rm -rf contrib/RCS
 chmod 644 contrib/*
 cp rh-config/fetchmailconf.wmconfig \$RPM_BUILD_ROOT/etc/X11/wmconfig/fetchmailconf
-cd \$RPM_BUILD_ROOT/usr/man/man1
+cd \$RPM_BUILD_ROOT%{_mandir}/man1
 ln -sf fetchmail.1 fetchmailconf.1
 
 %clean
@@ -140,7 +140,7 @@ rm -rf \$RPM_BUILD_ROOT
 %defattr (644, root, root, 755)
 %doc README NEWS NOTES FAQ COPYING FEATURES sample.rcfile contrib
 %doc fetchmail-features.html fetchmail-FAQ.html design-notes.html
-%attr(644, root, man) /usr/man/man1/*.1*
+%attr(644, root, man) %{_mandir}/man1/*.1*
 %attr(755, root, root) /usr/bin/fetchmail
 # Uncomment the following to support internationalization
 # %attr(644,root,root) /usr/share/locale/*/LC_MESSAGES/fetchmail.mo