cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pgpsendmail installation so that it no longer ka-blam! replaces

Browse Source 
sendmail...
Need some work yet to be repaired and work elegantly with mailwrapper.
This commit is contained in:
espie 2000-06-05 00:04:02 +00:00
parent e506d03142
commit 37bc688c36
14 changed files with 178 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/pgpsendmail/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2000/04/09 17:36:58 espie Exp $
# $OpenBSD: Makefile,v 1.12 2000/06/05 00:04:02 espie Exp $
# Original from: Ejovi Nuwere <ejovi@ejovi.net>
BROKEN= installs files in /usr. Needs to be moved to /usr/local.
#BROKEN= rethink mailwrapper mechanism
DISTNAME= PGPsendmail-v1.4.5
PKGNAME= pgpsendmail-1.4.5
CATEGORIES= mail
NEED_VERSION= 1.230
FAKE=No
MASTER_SITES= ftp://ftp.atnf.csiro.au/pub/people/rgooch/ \
ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
@ -21,6 +20,8 @@ PERMIT_DISTFILES_FTP= Yes
BUILD_DEPENDS += pgp::security/pgp
FAKE_FLAGS=MANDIR=${WRKINST}${PREFIX}/man
WRKDIST= ${WRKDIR}/pgpsendmail
INSTALL_TARGET= all_install
MAN1= pgppipe.1 sendpgppass.1

33
mail/pgpsendmail/patches/patch-Makefile Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-Makefile,v 1.1 2000/06/05 00:04:02 espie Exp $
--- Makefile.orig Tue Oct 21 00:58:19 1997
+++ Makefile Mon Jun 5 01:29:48 2000
@@ -30,7 +30,7 @@ DEFINES =
# Where do your manpages reside?
#
-MANDIR = /usr/man
+MANDIR = /usr/local/man
# Various compilers: if you have problems compiling, you may comment out the
@@ -112,8 +112,8 @@ match-email-addr: match-email-addr.o lib
$(CC) -o match-email-addr match-email-addr.o $(LDFLAGS)
-install: dummy pgpsendmail pgpdaemon sendpgppass pgppipe pgpsign extract-addrs\
- match-email-addr install.man
+all_install: dummy pgpsendmail pgpdaemon sendpgppass pgppipe pgpsign \
+ extract-addrs match-email-addr install.man
./install pgpsendmail $(SENDMAIL)
./install pgpdaemon
./install sendpgppass
@@ -123,8 +123,7 @@ install: dummy pgpsendmail pgpdaemon sen
./install match-email-addr
install.man: clean
- cp -rp man/* $(MANDIR)
-
+ cp -r man/* $(MANDIR)
reminder:
@echo ""

56
mail/pgpsendmail/patches/patch-aa
View File

@ -1,56 +0,0 @@
*** Makefile.orig Mon Oct 20 18:58:19 1997
--- Makefile Thu Apr 9 23:30:29 1998
***************
*** 30,36 ****
# Where do your manpages reside?
#
! MANDIR = /usr/man
# Various compilers: if you have problems compiling, you may comment out the
--- 30,36 ----
# Where do your manpages reside?
#
! MANDIR = /usr/local/man
# Various compilers: if you have problems compiling, you may comment out the
***************
*** 112,119 ****
$(CC) -o match-email-addr match-email-addr.o $(LDFLAGS)
! install: dummy pgpsendmail pgpdaemon sendpgppass pgppipe pgpsign extract-addrs\
! match-email-addr install.man
./install pgpsendmail $(SENDMAIL)
./install pgpdaemon
./install sendpgppass
--- 112,119 ----
$(CC) -o match-email-addr match-email-addr.o $(LDFLAGS)
! all_install: dummy pgpsendmail pgpdaemon sendpgppass pgppipe pgpsign \
! extract-addrs match-email-addr install.man
./install pgpsendmail $(SENDMAIL)
./install pgpdaemon
./install sendpgppass
***************
*** 123,130 ****
./install match-email-addr
install.man: clean
! cp -rp man/* $(MANDIR)
!
reminder:
@echo ""
--- 123,129 ----
./install match-email-addr
install.man: clean
! cp -r man/* $(MANDIR)
reminder:
@echo ""

14
mail/pgpsendmail/patches/patch-ab
View File

@ -1,14 +0,0 @@
*** lib/spawn.c.orig Thu Sep 25 00:21:58 1997
--- lib/spawn.c Thu Apr 9 23:15:05 1998
***************
*** 82,88 ****
--- 82,90 ----
{
int child_pid;
int in_fds[2], out_fds[2], err_fds[2];
+ #ifndef __OpenBSD__
extern char *sys_errlist[];
+ #endif
if (*in_fd < 0)
{

26
mail/pgpsendmail/patches/patch-ac
View File

@ -1,26 +0,0 @@
*** lib/keylist.c.orig Thu Apr 9 23:10:15 1998
--- lib/keylist.c Thu Apr 9 23:10:49 1998
***************
*** 76,82 ****
--- 76,84 ----
char keyring[STRING_LENGTH];
char txt[STRING_LENGTH];
struct stat statbuf_list, statbuf_keyring;
+ #ifndef __OpenBSD__
extern char *sys_errlist[];
+ #endif
static char *argv[] = {"pgp", "-kv", "+language=en", NULL};
sprintf (listfile, "%s/.keylist", pgppath);
***************
*** 263,269 ****
--- 265,273 ----
int ch;
FILE *in_fp;
char keyfile[STRING_LENGTH];
+ #ifndef __OpenBSD__
extern char *sys_errlist[];
+ #endif
sprintf (keyfile, "%s/mypubkey.asc", pgppath);
if ( ( in_fp = fopen (keyfile, "r") ) == NULL )

12
mail/pgpsendmail/patches/patch-ad
View File

@ -1,12 +0,0 @@
*** lib/options.c.orig Thu Apr 9 23:15:59 1998
--- lib/options.c Thu Apr 9 23:16:21 1998
***************
*** 69,74 ****
--- 69,75 ----
#include <sys/stat.h>
#include <fcntl.h>
#include <regex.h>
+ #include <errno.h>
#include "pgpsendmail.h"

12
mail/pgpsendmail/patches/patch-ae
View File

@ -1,12 +0,0 @@
*** pgpsign.c.orig Thu Apr 9 23:16:52 1998
--- pgpsign.c Thu Apr 9 23:17:02 1998
***************
*** 46,51 ****
--- 46,52 ----
#include <stdlib.h>
#include <signal.h>
#include <string.h>
+ #include <errno.h>
#include <pgpsendmail.h>
#include <version.h>

94
mail/pgpsendmail/patches/patch-af
View File

@ -1,94 +0,0 @@
*** install.orig Thu Oct 9 08:58:17 1997
--- install Thu Apr 9 23:44:20 1998
***************
*** 1,5 ****
--- 1,7 ----
#! /bin/csh -f
+ set USRBINPATH=/usr/local/bin
+
if ("$#argv" < "1") then
echo "Usage: install binary"
exit 1
***************
*** 29,39 ****
exit 0
endif
if ( ! -f $USRBINPATH/$binary ) then
! cp -p $binary $USRBINPATH
exit 0
endif
mv $USRBINPATH/$binary $USRBINPATH/${binary}.old
! cp -p $binary $USRBINPATH
if ("$status" != "0") then
mv $USRBINPATH/${binary}.old $USRBINPATH/$binary
exit 1
--- 31,43 ----
exit 0
endif
if ( ! -f $USRBINPATH/$binary ) then
! cp $binary $USRBINPATH
! chmod 755 $USRBINPATH/$binary
exit 0
endif
mv $USRBINPATH/$binary $USRBINPATH/${binary}.old
! cp $binary $USRBINPATH
! chmod 755 $USRBINPATH/$binary
if ("$status" != "0") then
mv $USRBINPATH/${binary}.old $USRBINPATH/$binary
exit 1
***************
*** 73,80 ****
echo "You cannot over-write ${sendmail_dir}/pgpsendmail"
exit 1
endif
! cp -p pgpsendmail ${sendmail_dir}/pgpsendmail.new
mv -f ${sendmail_dir}/pgpsendmail.new ${sendmail_dir}/pgpsendmail
echo "PGPsendmail installed as ${sendmail_dir}/pgpsendmail"
if ("$mortal" == "TRUE") then
echo "PGPsendmail will expect the real sendmail is ${sendmail_dir}/sendmail"
--- 77,85 ----
echo "You cannot over-write ${sendmail_dir}/pgpsendmail"
exit 1
endif
! cp pgpsendmail ${sendmail_dir}/pgpsendmail.new
mv -f ${sendmail_dir}/pgpsendmail.new ${sendmail_dir}/pgpsendmail
+ chmod 555 ${sendmail_dir}/pgpsendmail
echo "PGPsendmail installed as ${sendmail_dir}/pgpsendmail"
if ("$mortal" == "TRUE") then
echo "PGPsendmail will expect the real sendmail is ${sendmail_dir}/sendmail"
***************
*** 90,104 ****
if ("$?USRBINPATH" != "0") then
if (-w $USRBINPATH) then
echo "Writing PGPsendmail as: $USRBINPATH/pgpsendmail instead"
! cp -p pgpsendmail $USRBINPATH
exit 0
endif
endif
echo "PGPsendmail not installed. Do it yourself."
exit 2
endif
! cp -p pgpsendmail ${sendmail_dir}
cd ${sendmail_dir}
! mv sendmail sendmail.real
! ln -s pgpsendmail sendmail
--- 95,111 ----
if ("$?USRBINPATH" != "0") then
if (-w $USRBINPATH) then
echo "Writing PGPsendmail as: $USRBINPATH/pgpsendmail instead"
! cp pgpsendmail $USRBINPATH
! chmod 555 $USRBINPATH/pgpsendmail
exit 0
endif
endif
echo "PGPsendmail not installed. Do it yourself."
exit 2
endif
! cp pgpsendmail ${sendmail_dir}
cd ${sendmail_dir}
+ chmod 4555 pgpsendmail
!#mv sendmail sendmail.real
!#ln -s pgpsendmail sendmail

82
mail/pgpsendmail/patches/patch-install Normal file
View File

@ -0,0 +1,82 @@
$OpenBSD: patch-install,v 1.1 2000/06/05 00:04:03 espie Exp $
--- install.orig Thu Oct 9 14:58:17 1997
+++ install Mon Jun 5 01:41:11 2000
@@ -1,5 +1,7 @@
#! /bin/csh -f
+set USRBINPATH=${DESTDIR}/usr/local/bin
+
if ("$#argv" < "1") then
echo "Usage: install binary"
exit 1
@@ -29,11 +31,13 @@ if ("$binary" != "pgpsendmail") then
exit 0
endif
if ( ! -f $USRBINPATH/$binary ) then
- cp -p $binary $USRBINPATH
+ cp $binary $USRBINPATH
+ chmod 755 $USRBINPATH/$binary
exit 0
endif
mv $USRBINPATH/$binary $USRBINPATH/${binary}.old
- cp -p $binary $USRBINPATH
+ cp $binary $USRBINPATH
+ chmod 755 $USRBINPATH/$binary
if ("$status" != "0") then
mv $USRBINPATH/${binary}.old $USRBINPATH/$binary
exit 1
@@ -50,7 +54,7 @@ if (`fgrep -c PATH_SENDMAIL /usr/include
echo "Single definition of PATH_SENDMAIL not found in /usr/include/paths.h"
exit 1
endif
-set tmp = `fgrep PATH_SENDMAIL /usr/include/paths.h | cut -d'"' -f 2`
+set tmp = $(DESTDIR)`fgrep PATH_SENDMAIL /usr/include/paths.h | cut -d'"' -f 2`
if ( ! -x $tmp ) then
echo "File: $tmp is not executable"
exit 1
@@ -73,8 +77,9 @@ if (-f ${sendmail_dir}/pgpsendmail) then
echo "You cannot over-write ${sendmail_dir}/pgpsendmail"
exit 1
endif
- cp -p pgpsendmail ${sendmail_dir}/pgpsendmail.new
+ cp pgpsendmail ${sendmail_dir}/pgpsendmail.new
mv -f ${sendmail_dir}/pgpsendmail.new ${sendmail_dir}/pgpsendmail
+ chmod 555 ${sendmail_dir}/pgpsendmail
echo "PGPsendmail installed as ${sendmail_dir}/pgpsendmail"
if ("$mortal" == "TRUE") then
echo "PGPsendmail will expect the real sendmail is ${sendmail_dir}/sendmail"
@@ -90,30 +95,15 @@ if ( ! -w ${sendmail_dir} ) then
if ("$?USRBINPATH" != "0") then
if (-w $USRBINPATH) then
echo "Writing PGPsendmail as: $USRBINPATH/pgpsendmail instead"
- cp -p pgpsendmail $USRBINPATH
+ cp pgpsendmail $USRBINPATH
+ chmod 555 $USRBINPATH/pgpsendmail
exit 0
endif
endif
echo "PGPsendmail not installed. Do it yourself."
exit 2
endif
-cp -p pgpsendmail ${sendmail_dir}
+cp pgpsendmail ${sendmail_dir}
cd ${sendmail_dir}
-mv sendmail sendmail.real
-ln -s pgpsendmail sendmail
-
-echo "PGPsendmail installed as ${sendmail_dir}/pgpsendmail"
-if ("$mortal" == "TRUE") then
- echo "PGPsendmail will expect the real sendmail is ${sendmail_dir}/sendmail"
-else
- echo "PGPsendmail will expect the real sendmail is ${sendmail_dir}/sendmail.real"
-endif
-
-if ("$USER" == "root") then
- if ("$?PGPPATH" != "0") then
- echo "WARNING: Do not restart the sendmail daemon while you"
- echo "still have a PGPPATH environment variable"
- endif
-endif
-
+chmod 4555 pgpsendmail
exit 0

23
mail/pgpsendmail/patches/patch-lib_keylist_c Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-lib_keylist_c,v 1.1 2000/06/05 00:04:03 espie Exp $
--- lib/keylist.c.orig Sat Oct 4 02:01:20 1997
+++ lib/keylist.c Mon Jun 5 01:29:49 2000
@@ -76,7 +76,9 @@ flag freshen_keylist (char *pgppath)
char keyring[STRING_LENGTH];
char txt[STRING_LENGTH];
struct stat statbuf_list, statbuf_keyring;
+#ifndef __OpenBSD__
extern char *sys_errlist[];
+#endif
static char *argv[] = {"pgp", "-kv", "+language=en", NULL};
sprintf (listfile, "%s/.keylist", pgppath);
@@ -263,7 +265,9 @@ flag include_mykey (CONST char *pgppath,
int ch;
FILE *in_fp;
char keyfile[STRING_LENGTH];
+#ifndef __OpenBSD__
extern char *sys_errlist[];
+#endif
sprintf (keyfile, "%s/mypubkey.asc", pgppath);
if ( ( in_fp = fopen (keyfile, "r") ) == NULL )

11
mail/pgpsendmail/patches/patch-lib_options_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib_options_c,v 1.1 2000/06/05 00:04:03 espie Exp $
--- lib/options.c.orig Thu Oct 9 05:02:24 1997
+++ lib/options.c Mon Jun 5 01:29:49 2000
@@ -69,6 +69,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <regex.h>
+#include <errno.h>
#include "pgpsendmail.h"

13
mail/pgpsendmail/patches/patch-lib_spawn_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_spawn_c,v 1.1 2000/06/05 00:04:03 espie Exp $
--- lib/spawn.c.orig Thu Sep 25 06:21:58 1997
+++ lib/spawn.c Mon Jun 5 01:29:48 2000
@@ -82,7 +82,9 @@ int *err_fd;
{
int child_pid;
int in_fds[2], out_fds[2], err_fds[2];
+#ifndef __OpenBSD__
extern char *sys_errlist[];
+#endif
if (*in_fd < 0)
{

11
mail/pgpsendmail/patches/patch-pgpsign_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-pgpsign_c,v 1.1 2000/06/05 00:04:03 espie Exp $
--- pgpsign.c.orig Thu Oct 2 08:02:19 1997
+++ pgpsign.c Mon Jun 5 01:29:49 2000
@@ -46,6 +46,7 @@
#include <stdlib.h>
#include <signal.h>
#include <string.h>
+#include <errno.h>
#include <pgpsendmail.h>
#include <version.h>

4
mail/pgpsendmail/pkg/PLIST
View File

@ -1,6 +1,4 @@
@cwd /usr
sbin/pgpsendmail
@cwd /usr/local
bin/pgpsendmail
bin/pgpdaemon
bin/pgppipe
bin/sendpgppass