This commit is contained in:
jolan 2003-08-08 04:27:08 +00:00
parent d6ceb17f10
commit e99e5ac2ea
7 changed files with 97 additions and 46 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2003/07/25 04:52:45 jolan Exp $
# $OpenBSD: Makefile,v 1.2 2003/08/08 04:27:08 jolan Exp $
COMMENT= "filtering HTTP proxy server"
DISTNAME= ffproxy-1.4
DISTNAME= ffproxy-1.4.1
CATEGORIES= www
MASTER_SITES= http://faith.eu.org/ffproxy/

View File

@ -1,3 +1,3 @@
MD5 (ffproxy-1.4.tar.gz) = 1fb5e67a284395421419dab3a982e648
RMD160 (ffproxy-1.4.tar.gz) = 701149034abc741ec5424d1d2933db314a5c28f5
SHA1 (ffproxy-1.4.tar.gz) = 7e654b265938392d73608855940a42dfa7662362
MD5 (ffproxy-1.4.1.tar.gz) = d450fda6dcee92418d24d44faa2f8293
RMD160 (ffproxy-1.4.1.tar.gz) = 364ed59f1bec7541b46601b990bb2b6d6559f58f
SHA1 (ffproxy-1.4.1.tar.gz) = 12457a4742c9737ea63a95336475d5fab82ee944

View File

@ -1,15 +1,12 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2003/07/25 04:52:45 jolan Exp $
--- Makefile.orig Sun Jul 20 04:57:57 2003
+++ Makefile Thu Jul 24 20:40:15 2003
@@ -12,8 +12,9 @@ OBJS = $(SRCS:.c=.o)
$OpenBSD: patch-Makefile,v 1.2 2003/08/08 04:27:08 jolan Exp $
--- Makefile.orig 2003-08-01 15:24:07.000000000 -0500
+++ Makefile 2003-08-07 21:12:22.000000000 -0500
@@ -17,7 +17,7 @@ CC?=cc
MANPAGES = ffproxy.8
-PREFIX = /usr/local
-CC = gcc
+#PREFIX = /usr/local
+#CC = gcc
+CFLAGS+=-Wall
DATADIR?=/var/ffproxy
SYSCONFDIR?=/etc
-CFLAGS = ${OCFLAGS} -DCFGFILE="\"${SYSCONFDIR}/ffproxy.conf\"" -DDATADIR="\"${DATADIR}\""
+CFLAGS += ${OCFLAGS} -DCFGFILE="\"${SYSCONFDIR}/ffproxy.conf\"" -DDATADIR="\"${DATADIR}\""
all: proxy

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-socket_c,v 1.1.1.1 2003/07/25 04:52:45 jolan Exp $
--- socket.c.orig Sun Jul 20 06:25:05 2003
+++ socket.c Thu Jul 24 20:51:04 2003
@@ -30,6 +30,7 @@
#endif
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include "req.h"

View File

@ -1,7 +1,10 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.1.1.1 2003/07/25 04:52:45 jolan Exp $
# $OpenBSD: DEINSTALL,v 1.2 2003/08/08 04:27:09 jolan Exp $
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
SYSCONFDIR=${SYSCONFDIR:-/etc}
CONFIG_FILE=${SYSCONFDIR}/ffproxy.conf
FFPROXYDIR=/var/ffproxy
FFPROXYUSER=_ffproxy
FFPROXYGROUP=_ffproxy
@ -10,8 +13,18 @@ echo "+---------------"
echo "| To completely deinstall the $1 package you need to perform"
echo "| these steps as root:"
echo "|"
echo "| userdel $FFPROXYUSER"
echo "| groupdel $FFPROXYGROUP"
if userinfo -e $FFPROXYUSER; then
echo "| userdel $FFPROXYUSER"
fi
if groupinfo -e $FFPROXYGROUP; then
echo "| groupdel $FFPROXYGROUP"
fi
if [ -f $CONFIG_FILE ]; then
echo "| rm $CONFIG_FILE"
fi
if [ -d $FFPROXYDIR ]; then
echo "| rm -rf $FFPROXYDIR"
fi
echo "|"
echo "| Do not do this if you plan on re-installing $1"
echo "| at some future time."

View File

@ -1,7 +1,12 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1.1.1 2003/07/25 04:52:45 jolan Exp $
# $OpenBSD: INSTALL,v 1.2 2003/08/08 04:27:09 jolan Exp $
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
SYSCONFDIR=${SYSCONFDIR:-/etc}
CONFIG_FILE=${SYSCONFDIR}/ffproxy.conf
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/ffproxy
SAMPLE_CONFIG_FILE=$SAMPLE_CONFIG_DIR/ffproxy.conf
FFPROXYDIR=/var/ffproxy
FFPROXYUSER=_ffproxy
FFPROXYGROUP=_ffproxy
ID=523
@ -22,6 +27,58 @@ do_usergroup_install()
fi
}
do_config_notice()
{
echo
echo "+---------------"
echo "| The existing $1 configuration file $CONFIG_FILE"
echo "| has NOT been changed. You may want to compare it to the"
echo "| current sample file $SAMPLE_CONFIG_FILE,"
echo "| and update your configuration as needed."
echo "+---------------"
}
do_config_install()
{
install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
echo
echo "+---------------"
echo "| A $1 configuration file has been installed to:"
echo "| $CONFIG_FILE. Please view this file and"
echo "| adjust it to suit your needs."
echo "+---------------"
}
do_configdir_notice()
{
echo
echo "+---------------"
echo "| The existing $1 configuration data in $FFPROXYDIR"
echo "| has NOT been changed. You may want to compare it to the"
echo "| current sample configuration data in $SAMPLE_CONFIG_DIR,"
echo "| and update your configuration data as needed."
echo "+---------------"
}
do_configdir_install()
{
install -d -o root -g wheel -m 755 $FFPROXYDIR
install -d -o root -g wheel -m 755 $FFPROXYDIR/db
install -d -o root -g wheel -m 755 $FFPROXYDIR/html
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/db/* $FFPROXYDIR/db
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/html/* $FFPROXYDIR/html
echo
echo "+---------------"
echo "| Configuration data for $1 has been installed to:"
echo "|"
echo "| $FFPROXYDIR/db"
echo "| $FFPROXYDIR/html"
echo "|"
echo "| Please view the content of these directories and"
echo "| adjust it to suit your needs."
echo "+---------------"
}
# verify proper execution
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
@ -34,6 +91,16 @@ case $2 in
do_usergroup_install
;;
POST-INSTALL)
if [ ! -f $CONFIG_FILE ]; then
do_config_install $1
else
do_config_notice $1
fi
if [ ! -d $FFPROXYDIR ]; then
do_configdir_install $1
else
do_configdir_notice $1
fi
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2

View File

@ -1,15 +0,0 @@
Configuring ffproxy for use on OpenBSD
--------------------------------------
The locations to the ffproxy configuration file and data directory must
be specified via the -f and -D options, respectively. See the
ffproxy(8) manpage for more information.
Some helpful files have been installed:
- author's README ${PREFIX}/share/doc/ffproxy/README
- sample configuration ${PREFIX}/share/examples/ffproxy/ffproxy.conf
- sample db files ${PREFIX}/share/examples/ffproxy/db/*
- sample html files ${PREFIX}/share/examples/ffproxy/html/*