diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-01-05 19:28:35 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-01-05 19:28:35 +0000 |
| commit | 224101216c5876ca8e254a5a82f24c95ca279b01 (patch) | |
| tree | 77ec7011f66c26794ab492c8a4774cca82785a07 | |
| parent | 2007-01-04 net/tund: distfile disappeared and has no homepage (diff) | |
2006-12-01 misc/afbackup: Uses unregistered uid that conflicts with other ports
2006-12-01 misc/afbackup-client: Uses unregistered uid that conflicts with other ports
2006-12-01 misc/afbackup-server: Uses unregistered uid that conflicts with other ports
2006-12-14 lang/forth: obsoleted by lang/pfe; use of this port is pretty much senseless
2006-12-28 ftp/jmirror: distfile disappeared and has no homepage
39 files changed, 5 insertions, 3091 deletions
@@ -2678,3 +2678,8 @@ net/mrt||2007-01-05|Has expired: distfile and homepage disappeared net/tund||2007-01-05|Has expired: distfile disappeared and has no homepage net/xbms||2007-01-05|Has expired: distfile and homepage disappeared print/bibcard||2007-01-05|Has expired: distfile and homepage disappeared +misc/afbackup||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +misc/afbackup-client||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +misc/afbackup-server||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +lang/forth||2007-01-05|Has expired: obsoleted by lang/pfe; use of this port is pretty much senseless +ftp/jmirror||2007-01-05|Has expired: distfile disappeared and has no homepage diff --git a/ftp/Makefile b/ftp/Makefile index 05c78a994a0d..83ce9abe7720 100644 --- a/ftp/Makefile +++ b/ftp/Makefile @@ -42,7 +42,6 @@ SUBDIR += hsftp SUBDIR += jftp SUBDIR += jftpgw - SUBDIR += jmirror SUBDIR += junglemonkey SUBDIR += kasablanca SUBDIR += kbear diff --git a/ftp/jmirror/Makefile b/ftp/jmirror/Makefile deleted file mode 100644 index df1e6ff95654..000000000000 --- a/ftp/jmirror/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: jmirror -# Date Created: 4 Febuary 1999 -# Whom: Justin Robinson -# -# $FreeBSD$ -# - -PORTNAME= jmirror -PORTVERSION= 1.0b -CATEGORIES= ftp -MASTER_SITES= http://keyserver.kjsl.com/~jharris/distfiles/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= FTP mirroring program written in PERL (REQUIRES PERL5,Net::FTP) - -RUN_DEPENDS= ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net - -DEPRECATED= distfile disappeared and has no homepage -EXPIRATION_DATE= 2006-12-28 - -USE_PERL5= YES -NO_BUILD= YES -PLIST_FILES= bin/jmirror %%EXAMPLESDIR%%/sample.jmirror.conf -PLIST_DIRS= %%EXAMPLESDIR%% - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/jmirror ${PREFIX}/bin/jmirror - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/sample.jmirror.conf ${EXAMPLESDIR}/sample.jmirror.conf - -.include <bsd.port.mk> diff --git a/ftp/jmirror/distinfo b/ftp/jmirror/distinfo deleted file mode 100644 index f0c84c22d20a..000000000000 --- a/ftp/jmirror/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (jmirror-1.0b.tar.gz) = f42e049bff86641eebfbc84e848bfabf -SHA256 (jmirror-1.0b.tar.gz) = 2b5aac63a40e04c07d944d7e1b2e15bcff20afbcf476468e8612a487616509b0 -SIZE (jmirror-1.0b.tar.gz) = 2440 diff --git a/ftp/jmirror/pkg-descr b/ftp/jmirror/pkg-descr deleted file mode 100644 index 103d809f9997..000000000000 --- a/ftp/jmirror/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -The program 'jmirror' is designed to mirror an entire FTP site -or directory. This is REALLY useful for people who use an ftp -client that cannot download recursively. This requires both -PERL 5 (/usr/ports/lang/perl5/), and the CPAN module Net:FTP -(http://www.perl.org/CPAN/). - -- Justin Robinson -jmrobins@jmirror.ruin.org diff --git a/lang/Makefile b/lang/Makefile index 8c37be30a724..c4f349b3c1cb 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -59,7 +59,6 @@ SUBDIR += ferite SUBDIR += fesi SUBDIR += ficl-devel - SUBDIR += forth SUBDIR += fpc SUBDIR += fpc-base SUBDIR += fpc-devel diff --git a/lang/forth/Makefile b/lang/forth/Makefile deleted file mode 100644 index d98a8cf53a8d..000000000000 --- a/lang/forth/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: pfe -# Date created: 23 November 1994 -# Whom: mr -# -# $FreeBSD$ -# - -PORTNAME= pfe -PORTVERSION= 0.29.1 -PORTREVISION= 1 -CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= andrew.nau.ua@gmail.com -COMMENT= Implementation of ANSI Forth - -DEPRECATED= obsoleted by lang/pfe; use of this port is pretty much senseless -EXPIRATION_DATE= 2006-12-14 - -WRKSRC= ${WRKDIR}/${DISTNAME}/src - -USE_BZIP2= yes -USE_GMAKE= yes -MAKE_ARGS= OPTIM="${CFLAGS}" -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-float - -MAN1= pfe.1 -PLIST_FILES= bin/pfe lib/pfe/p4ed.so -PLIST_DIRS= lib/pfe -PORTDOCS= * - -.include <bsd.port.pre.mk> - -.if ${ARCH} != "i386" && ${ARCH} != "sparc64" -BROKEN= "Does not compile on !i386 and !sparc64" -.endif - -post-install: - ${INSTALL_MAN} ${WRKSRC}/../doc/pfe.1 ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/pfe - ${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${PREFIX}/share/doc/pfe -.endif - -.include <bsd.port.post.mk> diff --git a/lang/forth/distinfo b/lang/forth/distinfo deleted file mode 100644 index 819998ad8ec2..000000000000 --- a/lang/forth/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (pfe-0.29.1.tar.bz2) = d76d0481fc5eca52f9c55f9387908363 -SHA256 (pfe-0.29.1.tar.bz2) = 09690181885210fbc1cdc5715c5869afaddbbd4078760013fb954b4cb1642aea -SIZE (pfe-0.29.1.tar.bz2) = 552030 diff --git a/lang/forth/pkg-descr b/lang/forth/pkg-descr deleted file mode 100644 index c8a25841bdc4..000000000000 --- a/lang/forth/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -This package contains all neccessary ANSI-C source files to build a -running Forth-environment on most UNIX machines, on DOS and on OS/2. - -The Forth-system is closely modeled along the new American National -Standard for the programming language Forth. I implemented every word -of every word set mentioned in the dpANS-6 document of june 1993. -Additionally it is compatible to Forth-83. - -WWW: http://pfe.sourceforge.net/ diff --git a/misc/Makefile b/misc/Makefile index 02a036f12003..fe6848f6aabb 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -6,9 +6,6 @@ SUBDIR += achievo SUBDIR += aclgen SUBDIR += acron - SUBDIR += afbackup - SUBDIR += afbackup-client - SUBDIR += afbackup-server SUBDIR += airoflash SUBDIR += alevt SUBDIR += amanda-client diff --git a/misc/afbackup-client/Makefile b/misc/afbackup-client/Makefile deleted file mode 100644 index b778debd1874..000000000000 --- a/misc/afbackup-client/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# ports collection makefile for: afbackup-client -# Date created: 21 Sep 2001 -# Whom: Vadim Belman <voland@catpipe.net> -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -client - -WITHOUT_SERVER= yes - -MASTERDIR= ${.CURDIR}/../afbackup - -.include "${MASTERDIR}/Makefile" diff --git a/misc/afbackup-server/Makefile b/misc/afbackup-server/Makefile deleted file mode 100644 index f2dc91a8623a..000000000000 --- a/misc/afbackup-server/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# ports collection makefile for: afbackup-client -# Date created: 21 Sep 2001 -# Whom: Vadim Belman <voland@catpipe.net> -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -server - -WITHOUT_CLIENT= yes - -MASTERDIR= ${.CURDIR}/../afbackup - -.include "${MASTERDIR}/Makefile" diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile deleted file mode 100644 index 43506047bd5e..000000000000 --- a/misc/afbackup/Makefile +++ /dev/null @@ -1,207 +0,0 @@ -# New ports collection makefile for: afbackup -# Date created: 15 August 2001 -# Whom: Vadim Belman <voland@catpipe.net> -# -# $FreeBSD$ -# - -PORTNAME= afbackup -PORTVERSION= 3.3.5 -PORTREVISION= 3 -CATEGORIES?= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} -# XXX Remember to remove the comment if the actual variable is needed by someone. -#SLAVEDIRS=misc/afbackup-client misc/afbackup-server - -MAINTAINER= ports@FreeBSD.org -COMMENT= AF's backup system - -# version 3.4 is out, maybe it is worth saving this port -IGNORE= Uses unregistered uid that conflicts with other ports -DEPRECATED= ${IGNORE} -EXPIRATION_DATE=2006-12-01 - -WRKSRC= ${WRKDIR}/afbackup-3.3.5 -PLIST= ${WRKSRC}/pkg-plist - -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -.else -CONFIGURE_ARGS+= --disable-nls -.endif - -.if ! defined(NO_DES) -USE_OPENSSL= yes -CONFIG_WITH_DES= --with-des --with-des-header=openssl/des.h \ - --with-des-ldflag=-lcrypto -.endif -.if ! defined(NO_GUI) -BUILD_DEPENDS+= wish8.3:${PORTSDIR}/x11-toolkits/tk83 -RUN_DEPENDS+= wish8.3:${PORTSDIR}/x11-toolkits/tk83 -.else -MAKE_ARGS+= NO_GUI=yes -.endif -USE_AUTOTOOLS= autoconf:213 libtool:15 -.if defined(NO_AUTOKEY) && defined(PACKAGE_BUILDING) -INGORE = "cannot be build in batch mode whithout automated DES key generation" -.endif - -# afmserver sometimes dumps core if compiled with optimization. A bug in gcc? -CFLAGS+= -O0 - -CONFIGURE_ARGS= --with-included-gettext \ - --libexecdir=${PREFIX}/libexec/afbackup \ - ${CONFIG_WITH_DES} \ - --with-zlib \ - --with-prefixext=NO \ - --with-utilslibdir=${PREFIX}/lib/afbackup \ - --with-utilsincdir=${PREFIX}/include/afbackup \ - --with-utilsbindir=${PREFIX}/bin \ - --with-serverdir=${PREFIX} \ - --with-serverbindir=${PREFIX}/sbin \ - --with-serverconfdir=${PREFIX}/etc/afbackup \ - --with-serverlibdir=${PREFIX}/etc/afbackup \ - --with-servervardir=/var/spool/afbackup \ - --with-serverlogdir=/var/spool/afbackup \ - --with-serverconf=server.conf \ - --with-clientdir=${PREFIX} \ - --with-clientbindir=${PREFIX}/sbin \ - --with-clientconfdir=${PREFIX}/etc/afbackup \ - --with-clientlibdir=${PREFIX}/etc/afbackup \ - --with-clientvardir=/var/spool/afbackup \ - --with-clientlogdir=/var/spool/afbackup \ - --with-clientconf=client.conf \ - --with-commondir=${PREFIX} \ - --with-commondatadir=${PREFIX}/share/afbackup \ - --with-rexecdir=${PREFIX}/libexec/afbackup - -CLIENTMANPAGES= -SERVERMANPAGES= -INSTALL_TARGET= -PLIST_SRC= - -.if !defined(WITHOUT_CLIENT) -INSTALL_TARGET+= install.client -CLIENTMANPAGES= afclient.8 afrestore.8 afverify.8 \ - full_backup.8 incr_backup.8 copy_tape.8 \ - update_indexes.8 xafrestore.8 afclient.conf.8 -PLIST_SRC+= pkg-plist.client -.if !defined(NO_GUI) -PLIST_SRC+= pkg-plist.guiclient -.endif -.if !defined(NO_DES) -PLIST_SRC+= pkg-plist.desclient -.endif -.if defined(WITH_USERRESTORE) -INSTALL_TARGET+= install.userrestore -.endif -.endif -.if !defined(WITHOUT_SERVER) -INSTALL_TARGET+= install.server -SERVERMANPAGES= afserver.8 afmserver.8 cartis.8 \ - cartready.8 label_tape.8 cart_ctl.8 \ - afserver.conf.8 -PLIST_SRC+= pkg-plist.server -.if !defined(NO_GUI) -PLIST_SRC+= pkg-plist.guiserver -.endif -.endif -.if !defined(WITHOUT_REXECLINKS) -INSTALL_TARGET+= install.rexeclinks -PLIST_SRC+= pkg-plist.rexeclinks -.endif - -PLIST_SRC+= pkg-plist.l10n - -MAN8= ${CLIENTMANPAGES} ${SERVERMANPAGES} - -MANCOMPRESSED= no - -AFBACKUP_DOCS= CONFIG \ - COPYING \ - Changes \ - HOWTO.FAQ.DO-DONT \ - INSTALL \ - INSTALL.utilslib \ - INTRO \ - LICENSE \ - PROGRAMS \ - README \ - UPGRADE \ - changer.conf.chio \ - changer.conf.sch-mover \ - changer.conf.test \ - changer.conf.mtx \ - changer.conf.stctl - -.if defined(PACKAGE_BUILDING) -PKGINSTALL_ENV= "NONINTERACTIVE=YES" -.else -PKGINSTALL_ENV= -.endif - -.include <bsd.port.pre.mk> - -.if !defined(WITHOUT_SERVER) && !defined(WITHOUT_CLIENT) \ - && !defined(WITHOUT_REXECLINKS) && !defined(NO_GUI) \ - && !defined(NO_DES) && !defined(NO_AUTOKEY) -pre-fetch: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " -DWITHOUT_SERVER don't install the server part." - @${ECHO} " -DWITHOUT_CLIENT don't install the client part." - @${ECHO} " -DWITHOUT_REXECLINKS don't install links needed for remote execution." - @${ECHO} " -DWITH_USERRESTORE allow users to use restore." - @${ECHO} " -DNO_GUI build and install without TCL/TK tools." - @${ECHO} " -DNO_DES build and install without DES encryption." - @${ECHO} " -DNO_AUTOKEY don't autogenerate DES encryption key." - @${ECHO} "" -.endif - -pre-configure: - @${CP} ${FILESDIR}/configure.in ${FILESDIR}/Makefile.in ${WRKSRC} - @${CP} ${WRKSRC}/changer.conf.chio ${WRKSRC}/changer.conf - -.if !defined(NO_AUTOKEY) && !defined(NO_DES) -PLIST_SRC+= pkg-plist.autokey -pre-build: - @${PERL} -le 'print( ( "a".."z", "A".."Z", "0".."9")[ map { rand( 62)} 0..( rand( 10)+10)])' >${WRKSRC}/cryptkey -.endif - -pre-install: - @${ECHO} "==> Creating custom pkg-plist..." - @${RM} -rf ${PLIST} -.if !defined(NOPORTDOCS) - @for docfile in $(AFBACKUP_DOCS:S/^/share\/doc\/${PORTNAME}\//); do ${ECHO_CMD} $$docfile >>${PLIST}; done -.endif - @for plistfile in ${PLIST_SRC}; do ${CAT} ${FILESDIR}/$$plistfile >>${PLIST}; done - @${CAT} ${PLIST} | ${PERL} -nle 'print unless $$lines{$$_}++' >${PLIST}.tmp - @${CAT} ${PLIST}.tmp ${FILESDIR}/pkg-plist.fixedorder >${PLIST} -.if !defined(NOPORTDOCS) - @${ECHO_CMD} @cwd ${PREFIX} >>${PLIST} - @${ECHO_CMD} @dirrm share/doc/${PORTNAME} >>${PLIST} -.endif - @${SETENV} ${PKGINSTALL_ENV} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -post-install: -.if !defined(NO_AUTOKEY) && !defined(NO_DES) - ${INSTALL} ${COPY} -o afbackup -g operator -m 0400 ${WRKSRC}/cryptkey ${PREFIX}/etc/afbackup -.endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - for docfile in ${AFBACKUP_DOCS}; do ${INSTALL_DATA} ${WRKSRC}/$$docfile ${DOCSDIR}; done -.endif - @${ECHO} "" -.if !defined(NO_AUTOKEY) && !defined(NO_DES) - @${ECHO} "-------------------------------------------------------------------" - @${ECHO} " A DES key has been generated for your system." - @${ECHO} " It can be found in ${PREFIX}/etc/afbackup/cryptkey." - @${ECHO} " You can change it and perhaps corresponding settings" - @${ECHO} " in ${PREFIX}/etc/afbackup/(server|client).conf if" - @${ECHO} " you want." - @${ECHO} "-------------------------------------------------------------------" -.endif - -.include <bsd.port.post.mk> diff --git a/misc/afbackup/distinfo b/misc/afbackup/distinfo deleted file mode 100644 index 7fe74231bf8a..000000000000 --- a/misc/afbackup/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (afbackup-3.3.5.tar.gz) = b5ca87c040aba045512f63751a60684b -SHA256 (afbackup-3.3.5.tar.gz) = 77ea46a44f63d12ffb231b1656bf34197582dbe05ef0b0f1c038e6a0e371f8ad -SIZE (afbackup-3.3.5.tar.gz) = 873982 diff --git a/misc/afbackup/files/Makefile.in b/misc/afbackup/files/Makefile.in deleted file mode 100644 index 897b8d6816b6..000000000000 --- a/misc/afbackup/files/Makefile.in +++ /dev/null @@ -1,363 +0,0 @@ -SHELL = /bin/sh - -CC = @CC@ - -MAKECMD = make - -OSNAME = @osname@ - -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SUBDIRS = intl po - -X_INCLUDE = . -X_LIBS = . - -OPTIMIZE = -DEBUG = - -INCLUDES = -I$(X_INCLUDE) @DESINCLUDEPATH@ @ZLIB_INCLUDEPATH@ -DEFINES = -D$(OSNAME) -DOSNAME=$(OSNAME) @SYSDEFINES@ \ - @DESDEFINES@ @ZLIB_DEFINES@ - -CFLAGS = @CFLAGS@ $(INCLUDES) $(DEFINES) $(DEBUG) $(OPTIMIZE) \ - $(EXTRA_CFLAGS) @EXTRACFLAGS@ \ - -DLOCALEDIR=\"$(LOCALEDIR)\" - -UTILSLIB = x_utils - -X_HEADERS = crptauth.h \ - fileutil.h \ - mvals.h \ - netutils.h \ - packer.h \ - sysutils.h \ - utils.h \ - x_data.h \ - x_defs.h \ - x_errno.h \ - x_regex.h \ - x_timer.h \ - x_types.h \ - zutils.h - -X_LIBTOOLS = prosname.sh \ - prosspec.sh - - -BULIB = afbackup - -LIBRARIES = -l$(BULIB) -l$(UTILSLIB) @LIBS@ @DESLIBPATH@ \ - @DESLIB@ @ZLIB_LIBPATH@ @ZLIB_LIB@ -lm @INTLLIBS@ - -LDFLAGS = -L$(X_LIBS) $(LIBRARIES) $(EXTRA_LD_FLAGS) - -X_LIBSRCS = crptauth.c \ - pack.c \ - unpack.c \ - utils.c \ - goptions.c \ - fileutil.c \ - x_regex.c \ - mutils.c \ - sysutils.c \ - netutils.c \ - timeutil.c \ - typeutil.c \ - safewrap.c \ - zutils.c - -X_LIBOBJS = $(X_LIBSRCS:.c=.o) - -BULIBSRCS = buutil.c \ - prot.c - -BULIBOBJS = $(BULIBSRCS:.c=.o) - -CRYPTKEY = cryptkey.h - -CL_HELPERS = __piper __packpats @DESCRPT@ @ZIP@ -SV_HELPERS = __numset - -PROGRAMS = afserver afmserver afclient cartready label_tape \ - full_backup $(CL_HELPERS) $(SV_HELPERS) - -RESTRCLNTPROGS = afclient afbackup afrestore afverify copy_tape \ - full_backup incr_backup afbackout update_indexes \ - __descrpt __z -CLIENTPROGRAMS = $(RESTRCLNTPROGS) autocptapes afclientconfig \ - xafclientconfig xafrestore -RESTRSVRPROGS = afmserver afserver label_tape cartready changerready \ - cartis -SERVERPROGRAMS = $(RESTRSVRPROGS) afserverconfig cartagehandler \ - xafserverconfig xafserverstatus __inc_link __mt __numset - -X_LIBRARY = lib$(UTILSLIB).a -BACKUPLIB = lib$(BULIB).a - -BASELIBS = intllibs - -TESTMAINSRCS = testmain.c -TESTMAINOBJS = $(TESTMAINSRCS:.c=.o) - -SERVERSRCS = server.c -SERVEROBJS = $(SERVERSRCS:.c=.o) - -MSERVERSRCS = mserver.c -MSERVEROBJS = $(MSERVERSRCS:.c=.o) - -CARTRDYSRCS = cartready.c -CARTRDYOBJS = $(CARTRDYSRCS:.c=.o) - -LABELTAPESRCS = label_tape.c -LABELTAPEOBJS = $(LABELTAPESRCS:.c=.o) - -CLIENTSRCS = client.c -CLIENTOBJS = $(CLIENTSRCS:.c=.o) - -FULLBUSRCS = full_backup.c -FULLBUOBJS = $(FULLBUSRCS:.c=.o) - -TESTCLIENTSRCS = testclient.c -TESTCLIENTOBJS = $(TESTCLIENTSRCS:.c=.o) - -SERVERCONFFILE = server.conf -CLIENTCONFFILE = client.conf - -CHANGERCONFFILE = changer.conf - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -CLIENTLIBDIR = @clientlibdir@ -CLIENTBINDIR = @clientbindir@ -CLIENTVARDIR = @clientvardir@ -CLIENTMANDIR = @clientmandir@ -SERVERLIBDIR = @serverlibdir@ -SERVERBINDIR = @serverbindir@ -SERVERVARDIR = @servervardir@ -SERVERMANDIR = @servermandir@ -COMMONDIR = @commondir@ -COMMONDATADIR = @commondatadir@ -COMMONSHLIBDIR = @commonshlibdir@ - -BINDIR = @bindir@ -SBINDIR = @sbindir@ -LIBEXECDIR = @libexecdir@ -DATADIR = @datadir@ -SYSCONFDIR = @sysconfdir@ -MANDIR = @mandir@ -VARDIR = @localstatedir@ -REXECDIR = @REXECDIR@ - -# Where to install locale stuff -LOCALEDIR = $(DATADIR)/locale - -CLIENTMANFILES = afclient.X \ - afrestore.X \ - afverify.X \ - full_backup.X \ - incr_backup.X \ - copy_tape.X \ - update_indexes.X \ - xafrestore.X \ - afclient.conf.X -SERVERMANFILES = afserver.X \ - afmserver.X \ - cartis.X \ - cartready.X \ - label_tape.X \ - cart_ctl.X \ - afserver.conf.X - -SRCMANSUFFIX = 8 -DESTMANSUFFIX = 8 -CLIENTMANSRCS = $(CLIENTMANFILES:.X=.8) -SERVERMANSRCS = $(SERVERMANFILES:.X=.8) -# ^ this must be $(SRCMANSUFFIX) - -INSTALL = install -C - -.c.o: config.h - $(CC) -c $(CFLAGS) $< - -all:: $(PROGRAMS) potfiles - -server: afserver potfiles - @: - -afserver: $(CRYPTKEY) $(BACKUPLIB) $(X_LIBRARY) $(BASELIBS) $(SERVEROBJS) $(MSERVEROBJS) $(CARTRDYOBJS) $(LABELTAPEOBJS) xserverconfig xserverstatus $(SV_HELPERS) - $(CC) -o afserver $(SERVEROBJS) $(LDFLAGS) - $(CC) -o afmserver $(MSERVEROBJS) $(LDFLAGS) - $(CC) -o cartready $(CARTRDYOBJS) $(LDFLAGS) - $(CC) -o label_tape $(LABELTAPEOBJS) $(LDFLAGS) - -$(SERVEROBJS): $(CRYPTKEY) - -cartready: $(BACKUPLIB) $(X_LIBRARY) $(BASELIBS) $(CARTRDYOBJS) - $(CC) -o cartready $(CARTRDYOBJS) $(LDFLAGS) - -label_tape: $(BACKUPLIB) $(X_LIBRARY) $(BASELIBS) $(LABELTAPEOBJS) - $(CC) -o label_tape $(LABELTAPEOBJS) $(LDFLAGS) - -client: afclient potfiles - @: - -afclient: $(CRYPTKEY) $(BACKUPLIB) $(X_LIBRARY) $(BASELIBS) $(CLIENTOBJS) $(FULLBUOBJS) xclientconfig xrestore $(CL_HELPERS) - $(CC) -o afclient $(CLIENTOBJS) $(LDFLAGS) - $(CC) -o full_backup $(FULLBUOBJS) $(LDFLAGS) - -$(CLIENTOBJS): $(CRYPTKEY) - -$(CRYPTKEY): ask_for_key - @if [ -f cryptkey ]; then sh ./ask_for_key <cryptkey; else sh ./ask_for_key; fi - -potfiles: intllibs - (cd po; $(MAKE) DATADIR=\"$(DATADIR)\" all) - -intllibs: - (cd intl; $(MAKE) all) - -__piper: __piper.o $(BACKUPLIB) $(X_LIBRARY) - $(CC) -o __piper __piper.o $(LDFLAGS) - -__packpats: __packpats.o $(BACKUPLIB) $(X_LIBRARY) - $(CC) -o __packpats __packpats.o $(LDFLAGS) - -__numset: __numset.o $(BACKUPLIB) $(X_LIBRARY) - $(CC) -o __numset __numset.o $(LDFLAGS) - -__descrpt: $(CRYPTKEY) __descrpt.o $(BACKUPLIB) $(X_LIBRARY) - $(CC) -o __descrpt __descrpt.o $(LDFLAGS) - -__z: __z.o $(BACKUPLIB) $(X_LIBRARY) - $(CC) -o __z __z.o $(LDFLAGS) - -$(BACKUPLIB): $(BULIBOBJS) - ar rcv $(BACKUPLIB) $(BULIBOBJS) - if [ _@ranlib@ != _ ] ; then @ranlib@ $(BACKUPLIB) ; fi - -$(X_LIBRARY): $(X_LIBOBJS) - ar rcv $(X_LIBRARY) $(X_LIBOBJS) - if [ _@ranlib@ != _ ] ; then @ranlib@ $(X_LIBRARY) ; fi - -$(UTILSLIB):: $(X_LIBRARY) - -install.$(UTILSLIB): $(UTILSLIB) - install -d @utilsincdir@ @utilsincdir@/$(OSNAME) @utilslibdir@ \ - @utilslibdir@/$(OSNAME) @utilsbindir@ - for i in $(X_HEADERS) ; do /bin/rm -f @utilsincdir@/$$i ; \ - $(INSTALL) $$i @utilsincdir@/$$i ; done - for i in $(X_LIBRARY) ; do /bin/rm -f @utilslibdir@/$(OSNAME)/$$i ; \ - $(INSTALL) $$i @utilslibdir@/$(OSNAME)/$$i ; done - $(INSTALL) -m 0644 lconf.h @utilsincdir@/$(OSNAME)/lconf.h - $(INSTALL) -m 0644 lconf.gen.h @utilsincdir@/lconf.h - for i in $(X_LIBTOOLS) ; do \ - $(INSTALL) -m 0644 $$i @utilsbindir@/$$i ; done - -install:: install.client install.server install.client.man install.server.man - -install.client: client full_backup install.client.man install.l10n - install -d $(CLIENTBINDIR) $(CLIENTLIBDIR) $(COMMONSHLIBDIR) $(LIBEXECDIR) - install -d -o afbackup -g operator $(CLIENTVARDIR) - $(INSTALL) -g operator -m 0750 afclient $(SBINDIR) - ln -sf $(SBINDIR)/afclient $(SBINDIR)/afbackup - $(INSTALL) full_backup $(SBINDIR)/full_backup - ln -sf $(SBINDIR)/full_backup $(SBINDIR)/incr_backup - ln -sf $(SBINDIR)/full_backup $(SBINDIR)/afverify - ln -sf $(SBINDIR)/full_backup $(SBINDIR)/copy_tape - ln -sf $(SBINDIR)/full_backup $(SBINDIR)/afbackout - ln -sf $(SBINDIR)/full_backup $(SBINDIR)/update_indexes - ln -sf $(SBINDIR)/full_backup $(SBINDIR)/afrestore - $(INSTALL) -m 0755 clientconfig $(SBINDIR)/afclientconfig - ln -sf $(SBINDIR)/afclientconfig $(SBINDIR)/clientconfig - if [ -z "$(NO_GUI)" ]; then \ - $(INSTALL) -m 0755 xclientconfig $(SBINDIR)/xafclientconfig; \ - ln -sf $(SBINDIR)/xafclientconfig $(SBINDIR)/xclientconfig; \ - $(INSTALL) -m 0755 xrestore $(SBINDIR)/xafrestore; \ - ln -sf $(SBINDIR)/xafrestore $(SBINDIR)/xrestore; \ - fi - $(INSTALL) -m 0755 autocptapes $(SBINDIR)/autocptapes - $(INSTALL) -m 0755 __packpats $(LIBEXECDIR)/__packpats - $(INSTALL) -m 0755 __piper $(LIBEXECDIR)/__piper - if [ ! -z "@DESCRPT@" ] ; then \ - $(INSTALL) -m 0755 "@DESCRPT@" $(LIBEXECDIR)/@DESCRPT@ ; \ - fi - if [ ! -z "@ZIP@" ] ; then \ - $(INSTALL) -m 0755 "@ZIP@" $(LIBEXECDIR)/@ZIP@ ; \ - fi - $(INSTALL) -m 0644 aftcllib.tcl $(COMMONSHLIBDIR)/aftcllib.tcl - if [ ! -f $(SYSCONFDIR)/@clientconf@.sample ] ; then $(INSTALL) -m 0644 $(CLIENTCONFFILE) $(CLIENTLIBDIR)/@clientconf@.sample ; fi - -install.server: server cartready label_tape install.server.man install.l10n - install -d $(SERVERBINDIR) $(SERVERLIBDIR) $(COMMONSHLIBDIR) $(REXECDIR) $(LIBEXECDIR) - install -d -o afbackup -g operator $(SERVERVARDIR) - $(INSTALL) -o afbackup -g operator -m 0700 afserver afmserver $(LIBEXECDIR) - $(INSTALL) -m 04755 -o afbackup cartready $(SBINDIR) - $(INSTALL) -g operator -m 0750 label_tape $(SBINDIR) - $(INSTALL) -m 0755 __mt __inc_link $(LIBEXECDIR) - ln -sf $(SBINDIR)/label_tape $(SBINDIR)/cart_ctl - ln -sf $(SBINDIR)/label_tape $(SBINDIR)/cartis - ln -sf $(SBINDIR)/cartready $(SBINDIR)/changerready - $(INSTALL) -m 0755 serverconfig $(SBINDIR)/afserverconfig - ln -sf afserverconfig $(SBINDIR)/serverconfig - if [ -z "$(NO_GUI)" ]; then \ - $(INSTALL) -m 0755 xserverconfig $(SBINDIR)/xafserverconfig; \ - ln -sf xafserverconfig $(SBINDIR)/xserverconfig; \ - $(INSTALL) -m 0755 xserverstatus $(SBINDIR)/xafserverstatus; \ - ln -sf xafserverstatus $(SBINDIR)/xserverstatus; \ - fi - $(INSTALL) -m 0644 aftcllib.tcl $(COMMONSHLIBDIR)/aftcllib.tcl - $(INSTALL) -m 0755 __numset $(LIBEXECDIR)/__numset - if [ ! -f $(LIBEXECDIR)/cartagehandler ] ; then $(INSTALL) cartagehandler $(LIBEXECDIR)/cartagehandler ; fi - if [ ! -f $(SERVERLIBDIR)/@serverconf@.sample ] ; then $(INSTALL) -m 0644 $(SERVERCONFFILE) $(SERVERLIBDIR)/@serverconf@.sample ; fi - if [ ! -f $(SERVERLIBDIR)/$(CHANGERCONFFILE).sample ] ; then $(INSTALL) -m 0644 $(CHANGERCONFFILE) $(SERVERLIBDIR)/$(CHANGERCONFFILE).sample ; fi - touch $(SERVERVARDIR)/readonly_tapes - -install.rclient: install.server install.client install.rexeclinks - -install.userrestore: - $(INSTALL) -m 04755 -o root -g wheel full_backup $(SBINDIR)/afrestore - ln -sf $(SBINDIR)/afrestore $(SBINDIR)/afbackout - ln -sf $(SBINDIR)/afrestore $(SBINDIR)/update_indexes - -install.rexeclinks: - ( for i in full_backup incr_backup afverify afrestore copy_tape update_indexes ; do ln -sf $(CLIENTBINDIR)/"$$i" $(REXECDIR)/"$$i" ; done ) - -install.client.man: $(CLIENTMANSRCS) - install -d $(MANDIR)/man$(DESTMANSUFFIX) - ( for mansrc in $(CLIENTMANSRCS) ; do destfile=`echo $$mansrc|sed 's/[.]'$(SRCMANSUFFIX)'$$/.'$(DESTMANSUFFIX)/g` ; $(INSTALL) -m 0644 $$mansrc $(MANDIR)/man$(DESTMANSUFFIX)/$$destfile ; done ) - -install.server.man: $(SERVERMANSRCS) - install -d $(MANDIR)/man$(DESTMANSUFFIX) - ( for mansrc in $(SERVERMANSRCS) ; do destfile=`echo $$mansrc|sed 's/[.]'$(SRCMANSUFFIX)'$$/.'$(DESTMANSUFFIX)/g` ; $(INSTALL) -m 0644 $$mansrc $(MANDIR)/man$(DESTMANSUFFIX)/$$destfile ; done ) - -install.l10n: potfiles - (cd po; $(MAKE) datadir=\"$(DATADIR)\" install) - -xclientconfig: xcc - if [ -z "${NO_GUI}" ]; then ( ./build_shwish $? > $@; chmod +x $@) fi - -xserverconfig: xsc - if [ -z "${NO_GUI}" ]; then ( ./build_shwish $? > $@; chmod +x $@) fi - -xserverstatus: xss - if [ -z "${NO_GUI}" ]; then ( ./build_shwish $? > $@; chmod +x $@) fi - -xrestore: xrs - if [ -z "${NO_GUI}" ]; then ( ./build_shwish $? > $@; chmod +x $@) fi - -clean:: - - for subdir in $(SUBDIRS) ; do (cd $$subdir && $(MAKE) clean ) ; done - - rm -f *% *.o *.a *~ core* *_ - -veryclean: clean - - rm -f $(PROGRAMS) - -distclean: clean - - for subdir in $(SUBDIRS) ; do (cd $$subdir && $(MAKE) distclean ) ; done - - rm -f $(PROGRAMS) $(CRYPTKEY) xclientconfig xserverconfig xrestore xserverstatus - - rm -f config.cache config.log config.status config.setup Install.cache - - rm -f `/bin/ls *.in|sed 's/[.]in$$//g'|grep -v configure` confdefs.h - diff --git a/misc/afbackup/files/configure.in b/misc/afbackup/files/configure.in deleted file mode 100644 index efd27060643b..000000000000 --- a/misc/afbackup/files/configure.in +++ /dev/null @@ -1,895 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(backup.h) - -PACKAGE=afbackup -VERSION=`[grep VERSION_STRING version.h|sed 's/^[^"]*"//g'|sed 's/"[^"]*$//g']` -datadir='${prefix}/share/afbackup' -sysconfdir='${prefix}/etc/afbackup' -localstatedir='/var/spool/afbackup' -dnl VERSION=`[grep VERSION_STRING version.h|awk '{l=$0;while(substr(l,1,1)!="\"" && l != "")l=substr(l,2);l=substr(l,2);while(substr(l,length(l)-1,1)!="\"" && l != "") l=substr(l,1,length(l)-1);l=substr(l,1,length(l)-1);print l}']` -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) - -ALL_LINGUAS="it de" - -osname=`./prosname.sh` - -ARCH="`./prosspec.sh` $*" -ARCH="`echo $ARCH`" # for some stupid shells -if test -r config.setup ; then - CONFARCH=`cat config.setup` - if test "$CONFARCH" = "$ARCH" ; then - echo "Already configured for this setup. Remove config.setup to re-configure." - exit 0 - fi -fi -rm -f config.setup - -AC_CONFIG_HEADER(config.h) - -dnl Checks for programs. - -AC_CHECK_PROG(ranlib, ranlib, ranlib) - -dnl Checks for libraries. - -AM_GNU_GETTEXT - -dnl Checks for header files. - -if test `uname` = "FreeBSD" ; then - if test `uname -r` "<" '2' -a -r /usr/include/values.h ; then - ac_cv_header_values_h=yes - else - ac_cv_header_values_h=no - fi -fi - - -AC_HEADER_DIRENT -AC_HEADER_STDC -dnl AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(arpa/inet.h fcntl.h intl/locale.h limits.h malloc.h netinet/ip.h netinet/tcp.h netinet/in_systm.h pthread.h regex.h string.h strings.h sys/acl.h sys/ioctl.h sys/mode.h sys/mount.h sys/mtio.h sys/param.h sys/resource.h sys/select.h sys/statfs.h sys/statvfs.h sys/time.h sys/timers.h sys/vfs.h sys/wait.h termios.h termio.h time.h unistd.h values.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_STRUCT_ST_RDEV -AC_HEADER_TIME -AC_STRUCT_TM - -dnl Checks for library functions. -AC_FUNC_ALLOCA -AC_PROG_GCC_TRADITIONAL -AC_FUNC_MEMCMP -AC_TYPE_SIGNAL -AC_FUNC_UTIME_NULL -AC_FUNC_VPRINTF - -dnl Used by po/Makefile.in -AC_PROG_INSTALL - -# This seems to have been forgotten for some strange reason -if test _"${gt_cv_func_gettext_libintl}" = _yes -o _"$ac_cv_lib_intl_bindtextdomain" = _yes ; then - INTLLIBS="$INTLLIBS -lintl" -fi - -AC_MSG_CHECKING(for sys_errlist declaration) -AC_CACHE_VAL(ac_cv_decl_sys_errlist_def, -[AC_TRY_COMPILE([ -#include <stdio.h> -#include <errno.h> -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif],[printf("%s",sys_errlist[0]);], -ac_cv_decl_sys_errlist_def=yes, ac_cv_decl_sys_errlist_def=no) -]) -AC_MSG_RESULT($ac_cv_decl_sys_errlist_def) -if test $ac_cv_decl_sys_errlist_def = yes; then - AC_DEFINE(HAVE_SYS_ERRLIST_DEF) -fi - -OPTIMIZE=-O2 -if test $ac_cv_prog_gcc = no -a `echo $osname|grep 'HPUX'|wc -l` -gt 0 ; then - EXTRACFLAGS="+Olibcalls -Ae -Dhpux -Dunix -Dnotdef" - OPTIMIZE=-O -fi - -AC_CHECK_TYPE(signal_t, int) - -AC_ARG_ENABLE(threads, [ --disable-threads do not configure threads], - if test "x$enable_threads" != xyes; then enable_threads=no; fi, - enable_threads=yes) - -if test $enable_threads = yes ; then - # cannot use pthread_create here, cause IRIX will fail compiling. - # Solaris has pthread functions in libc, but they don't work, so - # we have to check for libpthread or libthread FIRST. - # BTW the m4 autoconf syntax constraints are terrible. - AC_CHECK_LIB(pthread, pthread_join, libpthread=yes, libpthread=no) - if test $libpthread = yes ; then - AC_DEFINE(HAVE_PTHREAD_JOIN) - LIBS="$LIBS -lpthread" - else - AC_CHECK_LIB(thread, pthread_join, libthread=yes, libthread=no) - if test $libthread = yes ; then - LIBS="$LIBS -lthread" - AC_DEFINE(HAVE_PTHREAD_JOIN) - else - AC_CHECK_FUNC(pthread_join, libc=yes, libc=no) - if test $libc = yes ; then - AC_DEFINE(HAVE_PTHREAD_JOIN) - else - AC_MSG_CHECKING(for FreeBSD-like pthreads) - LIBS_BEFORE="$LIBS" - CPPFLAGS_BEFORE="$CPPFLAGS" - LIBS="$LIBS -pthread" - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" - AC_CACHE_VAL(ac_cv_decl_freebsd_pthreads, - [AC_TRY_LINK([ -#include <stdio.h> -#include <errno.h> -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif],[pthread_join();], - ac_cv_decl_freebsd_pthreads=yes, ac_cv_decl_freebsd_pthreads=no) - ]) - AC_MSG_RESULT($ac_cv_decl_freebsd_pthreads) - if test $ac_cv_decl_freebsd_pthreads = yes; then - AC_DEFINE(HAVE_PTHREAD_JOIN) - SYSDEFINES="$SYSDEFINES -D_THREAD_SAFE" - else - LIBS="$LIBS_BEFORE" - CPPFLAGS="$CPPFLAGS_BEFORE" - fi - fi - fi - fi -fi - -AC_SUBST(SYSDEFINES) - -checkBoth=0 -AC_CHECK_FUNC(connect, checkSocket=0, checkSocket=1) -if test "$checkSocket" = 1; then - AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1) -fi -if test "$checkBoth" = 1; then - oldLibs=$LIBS - LIBS="$LIBS -lsocket -lnsl" - AC_CHECK_FUNC(accept, checkNsl=0, [LIBS=$oldLibs]) -fi -AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) - -AC_CHECK_FUNCS(bsearch door_create drand48 getcwd gettimeofday inet_ntoa isatty isnan lchown lfind lsearch memmove mkdir mkfifo mktime qsort rand re_comp regcomp re_compile_pattern rint seed48 select seteuid setreuid setresuid setegid setregid setresgid setitimer sighold sigrelse socket strcasecmp strncasecmp strcasestr strdup strerror strrstr strstr timer_create uname acl setacl chacl sys_errlist stat64 statvfs vsnprintf vsyslog) -AC_CHECK_LIB(acl, acl_get_file, acl_get_file=yes, acl_get_file=no) -if test $acl_get_file = yes ; then - LIBS="$LIBS -lacl" -else - AC_CHECK_LIB(pacl, acl_get_file, acl_get_file=yes, acl_get_file=no) - if test $acl_get_file = yes ; then - LIBS="$LIBS -lpacl" - else - AC_CHECK_FUNC(acl_get_file, acl_get_file=yes, acl_get_file=no) - fi -fi - -if test "$ac_cv_func_re_comp" != yes ; then - AC_CHECK_LIB(compat, re_comp, [LIBS="$LIBS -lcompat"]) - unset ac_cv_func_re_comp - AC_CHECK_FUNCS(re_comp) -fi -if test "$ac_cv_func_stat64" = yes ; then - AC_DEFINE(_64_BIT_FILESIZE_) -fi - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=${prefix} - - - -AC_ARG_WITH(utilslibdir, - [ --with-utilslibdir=DIR server configuration files in DIR [prefix/lib]], - [ - if test "$withval"; then - utilslibdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-utilslibdir - option.]) - fi - ] -) -: ${utilslibdir:='$prefix/lib'} -utilslibdir=`( - eval echo "$utilslibdir" -)` -AC_SUBST(utilslibdir) -AC_ARG_WITH(utilsincdir, - [ --with-utilsincdir=DIR server configuration files in DIR [prefix/include]], - [ - if test "$withval"; then - utilsincdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-utilsincdir - option.]) - fi - ] -) -: ${utilsincdir:='$prefix/include'} -utilsincdir=`( - eval echo "$utilsincdir" -)` -AC_SUBST(utilsincdir) -AC_ARG_WITH(utilsbindir, - [ --with-utilsbindir=DIR server configuration files in DIR [prefix/bin]], - [ - if test "$withval"; then - utilsbindir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-utilsbindir - option.]) - fi - ] -) -: ${utilsbindir:='$prefix/bin'} -utilsbindir=`( - eval echo "$utilsbindir" -)` -AC_SUBST(utilsbindir) - -prefixext=yes -AC_ARG_WITH(prefixext, - [ --with-prefixext=YESNO extend prefix with /backup [yes]], - [ - if test "$withval"; then - prefixext="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-prefixext - option.]) - fi - ] -) -subdir="/backup" -if test $prefixext != "yes" ; then - subdir="" -fi - -dnl *** server side *** -AC_ARG_WITH(serverdir, - [ --with-serverdir=DIR server installation in DIR [prefix/subdir/server]], - [ - if test "$withval"; then - serverdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-serverdir - option.]) - fi - ] -) -: ${serverdir:='$prefix$subdir/server'} -serverdir=`( - eval echo "$serverdir" -)` -AC_SUBST(serverdir) -dnl *** serverbindir -AC_ARG_WITH(serverbindir, - [ --with-serverbindir=DIR server binaries in DIR [serverdir/bin]], - [ - if test "$withval"; then - serverbindir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-serverbindir - option.]) - fi - ] -) -: ${serverbindir:='$serverdir/bin'} -serverbindir=`( - eval echo "$serverbindir" -)` -AC_SUBST(serverbindir) -dnl *** serverlibdir -AC_ARG_WITH(serverlibdir, - [ --with-serverlibdir=DIR server configuration files in DIR [serverdir/lib]], - [ - if test "$withval"; then - serverlibdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-serverlibdir - option.]) - fi - ] -) -: ${serverlibdir:='$serverdir/lib'} -serverlibdir=`( - eval echo "$serverlibdir" -)` -AC_SUBST(serverlibdir) -dnl *** serverconfdir -AC_ARG_WITH(serverconfdir, - [ --with-serverconfdir=DIR server configuration files in DIR [serverdir/lib]], - [ - if test "$withval"; then - serverconfdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-serverconfdir - option.]) - fi - ] -) -: ${serverconfdir:='$serverdir/lib'} -serverconfdir=`( - eval echo "$serverconfdir" -)` -AC_SUBST(serverconfdir) -dnl *** servervardir -AC_ARG_WITH(servervardir, - [ --with-servervardir=DIR variable server files in DIR [serverdir/var]], - [ - if test "$withval"; then - servervardir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-servervardir - option.]) - fi - ] -) -: ${servervardir:='$serverdir/var'} -servervardir=`( - eval echo "$servervardir" -)` -AC_SUBST(servervardir) -dnl *** servermandir -AC_ARG_WITH(servermandir, - [ --with-servermandir=DIR variable server files in DIR [serverdir/man]], - [ - if test "$withval"; then - servermandir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-servermandir - option.]) - fi - ] -) -: ${servermandir:='$serverdir/man'} -servermandir=`( - eval echo "$servermandir" -)` -AC_SUBST(servermandir) -dnl *** serverlogdir -AC_ARG_WITH(serverlogdir, - [ --with-serverlogdir=DIR server log files in DIR [serverdir/var]], - [ - if test "$withval"; then - serverlogdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-serverlogdir - option.]) - fi - ] -) -: ${serverlogdir:='$serverdir/var'} -serverlogdir=`( - eval echo "$serverlogdir" -)` -AC_SUBST(serverlogdir) - -dnl *** client side *** -AC_ARG_WITH(clientdir, - [ --with-clientdir=DIR client installation in DIR [prefix/subdir/client]], - [ - if test "$withval"; then - clientdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-clientdir - option.]) - fi - ] -) -: ${clientdir:='$prefix$subdir/client'} -clientdir=`( - eval echo "$clientdir" -)` -AC_SUBST(clientdir) -dnl *** clientbindir -AC_ARG_WITH(clientbindir, - [ --with-clientbindir=DIR client binaries in DIR [clientdir/bin]], - [ - if test "$withval"; then - clientbindir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-clientbindir - option.]) - fi - ] -) -: ${clientbindir:='$clientdir/bin'} -clientbindir=`( - eval echo "$clientbindir" -)` -AC_SUBST(clientbindir) -dnl *** clientlibdir -AC_ARG_WITH(clientlibdir, - [ --with-clientlibdir=DIR client configuration files in DIR [clientdir/lib]], - [ - if test "$withval"; then - clientlibdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-clientlibdir - option.]) - fi - ] -) -: ${clientlibdir:='$clientdir/lib'} -clientlibdir=`( - eval echo "$clientlibdir" -)` -AC_SUBST(clientlibdir) -dnl *** clientconfdir -AC_ARG_WITH(clientconfdir, - [ --with-clientconfdir=DIR client configuration files in DIR [clientdir/lib]], - [ - if test "$withval"; then - clientconfdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-clientconfdir - option.]) - fi - ] -) -: ${clientconfdir:='$clientdir/lib'} -clientconfdir=`( - eval echo "$clientconfdir" -)` -AC_SUBST(clientconfdir) -dnl *** clientvardir -AC_ARG_WITH(clientvardir, - [ --with-clientvardir=DIR variable client files in DIR [clientdir/var]], - [ - if test "$withval"; then - clientvardir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-clientvardir - option.]) - fi - ] -) -: ${clientvardir:='$clientdir/var'} -clientvardir=`( - eval echo "$clientvardir" -)` -AC_SUBST(clientvardir) -dnl *** clientmandir -AC_ARG_WITH(clientmandir, - [ --with-clientmandir=DIR variable client files in DIR [clientdir/man]], - [ - if test "$withval"; then - clientmandir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-clientmandir - option.]) - fi - ] -) -: ${clientmandir:='$clientdir/man'} -clientmandir=`( - eval echo "$clientmandir" -)` -AC_SUBST(clientmandir) -dnl *** clientlogdir -AC_ARG_WITH(clientlogdir, - [ --with-clientlogdir=DIR client log files in DIR [clientdir/var]], - [ - if test "$withval"; then - clientlogdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-clientlogdir - option.]) - fi - ] -) -: ${clientlogdir:='$clientdir/var'} -clientlogdir=`( - eval echo "$clientlogdir" -)` -AC_SUBST(clientlogdir) -dnl *** rexecdir -AC_ARG_WITH(rexecdir, - [ --with-rexecdir=DIR binaries for remote execution in DIR [prefix/rexec]], - [ - if test "$withval"; then - REXECDIR="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-rexecdir - option.]) - fi - ] -) -: ${REXECDIR:='$prefix$subdir/rexec'} -REXECDIR=`( - eval echo "$REXECDIR" -)` -AC_SUBST(REXECDIR) -dnl *** clientconf -AC_ARG_WITH(clientconf, - [ --with-clientconf=NAME NAME for client configuration [backup.conf]], - [ - if test "$withval"; then - clientconf="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-clientconf - option.]) - fi - ] -) -: ${clientconf:=backup.conf} -clientconf=`( - eval echo "$clientconf" -)` -AC_SUBST(clientconf) -dnl *** serverconf -AC_ARG_WITH(serverconf, - [ --with-serverconf=NAME NAME for server configuration [backup.conf]], - [ - if test "$withval"; then - serverconf="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-serverconf - option.]) - fi - ] -) -: ${serverconf:=backup.conf} -serverconf=`( - eval echo "$serverconf" -)` -AC_SUBST(serverconf) -dnl *** commondir -AC_ARG_WITH(commondir, - [ --with-commondir=DIR software for client and server will reside in DIR [prefix/common]], - [ - if test "$withval"; then - commondir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-commondir - option.]) - fi - ] -) -: ${commondir:='$prefix$subdir/common'} -commondir=`( - eval echo "$commondir" -)` -AC_SUBST(commondir) -dnl *** commondatadir -AC_ARG_WITH(commondatadir, - [ --with-commondatadir=DIR architecture independent data for client and server will reside in DIR [commondir/share]], - [ - if test "$withval"; then - commondatadir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-commondatadir - option.]) - fi - ] -) -: ${commondatadir:='$commondir/share'} -commondatadir=`( - eval echo "$commondatadir" -)` -AC_SUBST(commondatadir) -dnl *** commonshlibdir -AC_ARG_WITH(commonshlibdir, - [ --with-commonshlibdir=DIR architecture independent program text for client and server will reside in DIR [commondatadir/lib]], - [ - if test "$withval"; then - commonshlibdir="$withval" - else - AC_MSG_WARN([*** You must supply an argument to the --with-commonshlibdir - option.]) - fi - ] -) -: ${commonshlibdir:='$commondatadir/lib'} -commonshlibdir=`( - eval echo "$commonshlibdir" -)` -AC_SUBST(commonshlibdir) - - -dnl DES stuff - -usedes=no -AC_ARG_WITH(des, - [ --with-des for client/server authentication [no]], - [ - usedes=yes - des_include=../libdes - des_libdir=`echo $des_include|sed 's#include$#lib#g'` - des_header=des.h - des_ldflag=-ldes - ] -) - -AC_ARG_WITH(des-include, - [ --with-des-include=DIR des header file in DIR [../libdes]], - [ - if test "$withval"; then - usedes=yes - des_include="$withval" - des_libdir="$des_include" - des_header=des.h - des_ldflag=-ldes - else - AC_MSG_WARN([*** You must supply an argument to the --with-des-include - option.]) - fi - ] -) - -AC_ARG_WITH(des-header, - [ --with-des-header=NAME NAME is des header file [des.h]], - [ - if test "$withval"; then - usedes=yes - des_header="$withval" - des_ldflag=-ldes - if test _"$des_include" = _ ; then - des_include=../libdes - des_libdir="$des_include" - fi - else - AC_MSG_WARN([*** You must supply an argument to the --with-des-header - option.]) - fi - ] -) - -AC_ARG_WITH(des-libdir, - [ --with-des-libdir=DIR des library is in DIR [../libdes]], - [ - if test "$withval"; then - usedes=yes - des_libdir="$withval" - des_ldflag=-ldes - if test _"$des_include" = _ ; then - des_include="$des_libdir" - fi - if test _"$des_header" = _ ; then - des_header="des.h" - fi - else - AC_MSG_WARN([*** You must supply an argument to the --with-des-libdir - option.]) - fi - ] -) - -AC_ARG_WITH(des-ldflag, - [ --with-des-ldflag=LIB des library is specified by LIB [-ldes]], - [ - if test "$withval"; then - usedes=yes - des_ldflag="$withval" - if test _"$des_include" = _ ; then - des_include=../libdes - fi - if test _"$des_header" = _ ; then - des_header="des.h" - fi - if test _"$des_libdir" = _ ; then - des_libdir="$des_include" - fi - else - AC_MSG_WARN([*** You must supply an argument to the --with-des-ldflag - option.]) - fi - ] -) - -if test $usedes = "no" ; then - DESINCLUDEPATH="" - DESDEFINES="" - DESLIB="" - DESLIBPATH="" - DESHEADER="" - DESCRPT="" -else - if test `echo $des_ldflag|grep '^lib'|wc -l` -gt 0 ; then - des_ldflag=`echo $des_ldflag|sed 's/^lib/-l/g;s/[.].*//g'` - fi - - DESINCLUDEPATH="-I$des_include" - DESDEFINES="-DHAVE_DES_ENCRYPTION" - DESHEADER="$des_header" - DESLIBPATH="-L$des_libdir" - DESLIB="$des_ldflag" - DESCRPT="__descrpt" -fi - -AC_SUBST(DESDEFINES) -AC_SUBST(DESINCLUDEPATH) -AC_SUBST(DESLIBPATH) -AC_SUBST(DESLIB) -AC_SUBST(DESHEADER) -AC_SUBST(DESCRPT) - - -dnl zlib stuff - -usezlib=no -AC_ARG_WITH(zlib, - [ --with-zlib for builtin compression [no]], - [ - usezlib=yes - zlib_include=/usr/local/include - zlib_libdir=`echo $zlib_include|sed 's#include$#lib#g'` - ] -) - -AC_ARG_WITH(zlib-include, - [ --with-zlib-include=DIR zlib header file in DIR [/usr/local/include]], - [ - if test "$withval"; then - usezlib=yes - zlib_include="$withval" - zlib_libdir="$zlib_include" - else - AC_MSG_WARN([*** You must supply an argument to the --with-zlib-include - option.]) - fi - ] -) - -AC_ARG_WITH(zlib-libdir, - [ --with-zlib-libdir=DIR zlib library is in DIR [/usr/local/lib]], - [ - if test "$withval"; then - usezlib=yes - zlib_libdir="$withval" - if test _"$zlib_include" = _ ; then - zlib_include="$zlib_libdir" - fi - else - AC_MSG_WARN([*** You must supply an argument to the --with-zlib-libdir - option.]) - fi - ] -) - -AC_SUBST(commondir) -AC_SUBST(commondatadir) -AC_SUBST(commonshlibdir) - - -if test $usezlib = "no" ; then - ZLIB_INCLUDEPATH="" - ZLIB_DEFINES="" - ZLIB_LIB="" - ZLIB_LIBPATH="" - ZIP="" -else - ZLIB_INCLUDEPATH="-I$zlib_include" - ZLIB_DEFINES="-DUSE_ZLIB" - ZLIB_LIBPATH="-L$zlib_libdir" - ZLIB_LIB="-lz" - ZIP="__z" -fi - -AC_SUBST(ZLIB_DEFINES) -AC_SUBST(ZLIB_INCLUDEPATH) -AC_SUBST(ZLIB_LIBPATH) -AC_SUBST(ZLIB_LIB) -AC_SUBST(ZIP) - - -locspec=`echo $prefix|sed 's#/#^#g'` -AC_SUBST(locspec) - -AC_SUBST(EXTRACFLAGS) -AC_SUBST(OPTIMIZE) - -AC_SUBST(osname) -AC_SUBST(CC) - -HEADERS="regex.h limits.h values.h" -for header in $HEADERS ; do - safeval=`echo "$header" | sed 'y%./+-%__p_%'` - uppersafeval=`echo $safeval|tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - VNAM=DONT_INC_$uppersafeval - eval $VNAM=DONT_ - eval isset='$'ac_cv_header_$safeval - if test $isset = yes ; then - eval $VNAM="" - fi -done -DONT_DECL_RE_UTILS="DONT_" -DONT_DECL_POSIX_REGEX="DONT_" -if test $ac_cv_func_re_compile_pattern != yes ; then - DONT_DECL_RE_UTILS="" -fi -if test $ac_cv_func_regcomp != yes ; then - DONT_DECL_POSIX_REGEX="" -fi -AC_SUBST(DONT_INC_REGEX_H) -AC_SUBST(DONT_INC_VALUES_H) -AC_SUBST(DONT_INC_LIMITS_H) -AC_SUBST(DONT_DECL_RE_UTILS) -AC_SUBST(DONT_DECL_POSIX_REGEX) - -FUNCTIONS="strrstr strcasestr memmove qsort bsearch lsearch lfind rint isnan isatty re_comp" -for function in $FUNCTIONS ; do - safeval=`echo "$function" | sed 'y%./+-%__p_%'` - uppersafeval=`echo $safeval|tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - VNAM=DONT_DEF_$uppersafeval - eval $VNAM=DONT_ - eval isset='$'ac_cv_func_$safeval - if test $isset != yes ; then - eval $VNAM="" - fi -done -AC_SUBST(DONT_DEF_STRRSTR) -AC_SUBST(DONT_DEF_STRCASESTR) -AC_SUBST(DONT_DEF_MEMMOVE) -AC_SUBST(DONT_DEF_QSORT) -AC_SUBST(DONT_DEF_BSEARCH) -AC_SUBST(DONT_DEF_LSEARCH) -AC_SUBST(DONT_DEF_LFIND) -AC_SUBST(DONT_DEF_RINT) -AC_SUBST(DONT_DEF_ISATTY) -AC_SUBST(DONT_DEF_ISNAN) -AC_SUBST(DONT_DEF_RE_COMP) - - -DONT_INC_TIME_H=DONT_ -DONT_INC_SYS_TIME_H=DONT_ -if test $ac_cv_header_time_h ; then - DONT_INC_TIME_H="" -fi -if test $ac_cv_header_time = yes ; then - DONT_INC_TIME_H="" - DONT_INC_SYS_TIME_H="" -else - if test $ac_cv_header_sys_time_h = yes ; then - DONT_INC_SYS_TIME_H="" - fi -fi -DONT_INC_SYS_TIMERS_H=DONT_ -if test $ac_cv_header_sys_timers_h = yes ; then - DONT_INC_SYS_TIMERS_H="" -fi - -AC_SUBST(DONT_INC_TIME_H) -AC_SUBST(DONT_INC_SYS_TIME_H) -AC_SUBST(DONT_INC_SYS_TIMERS_H) - -DONT_USE_SOLARIS2_ACLS="DONT_" -if test $ac_cv_header_sys_acl_h = yes -a $ac_cv_func_acl = yes ; then - DONT_USE_SOLARIS2_ACLS="" -fi -AC_SUBST(DONT_USE_SOLARIS2_ACLS) - -DONT_USE_HPUX10_ACLS="DONT_" -if test $ac_cv_header_sys_acl_h = yes -a $ac_cv_func_setacl = yes ; then - DONT_USE_HPUX10_ACLS="" -fi -AC_SUBST(DONT_USE_HPUX10_ACLS) - -DONT_USE_POSIX_ACLS="DONT_" -if test $ac_cv_header_sys_acl_h = yes -a $acl_get_file = yes ; then - DONT_USE_POSIX_ACLS="" - AC_CHECK_FUNC(acl_free_text, AC_DEFINE(HAVE_ACL_FREE_TEXT)) - AC_CHECK_FUNC(acl_to_short_text, AC_DEFINE(HAVE_ACL_TO_SHORT_TEXT)) -fi -AC_SUBST(DONT_USE_POSIX_ACLS) - -AC_OUTPUT(lconf.h budefs.h des_aux.h Makefile server.conf client.conf shwish.head xcc xsc xrs xss clientconfig serverconfig autocptapes afclient.8 cartis.8 cartready.8 afserver.8 afmserver.8 label_tape.8 cart_ctl.8 full_backup.8 incr_backup.8 afrestore.8 afverify.8 update_indexes.8 copy_tape.8 xafrestore.8 afclient.conf.8 afserver.conf.8 CONFIG intl/Makefile po/Makefile.in) - -echo "$ARCH" > config.setup diff --git a/misc/afbackup/files/patch-aa b/misc/afbackup/files/patch-aa deleted file mode 100644 index 05d1ed1d78f8..000000000000 --- a/misc/afbackup/files/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ ---- __descrpt.c.orig Mon Jun 18 11:47:22 2001 -+++ __descrpt.c Fri Nov 2 15:51:09 2001 -@@ -129,12 +129,12 @@ - } - - if(weak) -- des_cbc_encrypt((des_cblock *) buf, (des_cblock *) outbuf, -+ des_cbc_encrypt(buf, outbuf, - len * sizeof(UChar), - accesskeys[0], ivec, encrypt); - else - #ifndef LIBDESBUG_COMPATIBILITY -- des_ede2_cbc_encrypt((des_cblock *) buf, (des_cblock *) outbuf, -+ des_ede2_cbc_encrypt(buf, outbuf, - len * sizeof(UChar), - accesskeys[0], accesskeys[1], ivec, encrypt); - #else diff --git a/misc/afbackup/files/patch-ab b/misc/afbackup/files/patch-ab deleted file mode 100644 index 8dbf11187918..000000000000 --- a/misc/afbackup/files/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ ---- crptauth.c.orig Mon Jun 18 11:47:22 2001 -+++ crptauth.c Fri Nov 2 15:51:10 2001 -@@ -344,7 +344,7 @@ - } - - #ifndef LIBDESBUG_COMPATIBILITY -- des_ede2_cbc_encrypt((des_cblock *) buf, (des_cblock *) lbuf, -+ des_ede2_cbc_encrypt(buf, lbuf, - 16 * sizeof(UChar), - keys[0], keys[1], ivec, 1); - #else -@@ -403,10 +403,10 @@ - } - - #ifndef LIBDESBUG_COMPATIBILITY -- des_ede2_cbc_encrypt((des_cblock *) buf, (des_cblock *) cbuf, -+ des_ede2_cbc_encrypt(buf, cbuf, - l * sizeof(UChar), - keys[0], keys[1], -- ivec, en ? 1 : 0); -+ (des_cblock*) ivec, en ? 1 : 0); - #else - des_3cbc_encrypt((des_cblock *) buf, (des_cblock *) cbuf, - l * sizeof(UChar), diff --git a/misc/afbackup/files/patch-ac b/misc/afbackup/files/patch-ac deleted file mode 100644 index 26feb13f6c8c..000000000000 --- a/misc/afbackup/files/patch-ac +++ /dev/null @@ -1,68 +0,0 @@ ---- full_backup.c.orig Tue Oct 9 08:09:00 2001 -+++ full_backup.c Fri Nov 2 15:51:10 2001 -@@ -165,6 +165,7 @@ - UChar *default_paramfiles[] = { DEFAULT_CLIENT_CONFIGFILES , NULL }; - - UChar *bindir = NULL; -+UChar *libexecdir = NULL; - UChar *vardir = NULL; - UChar *libdir = NULL; - UChar *confdir = NULL; -@@ -172,6 +173,7 @@ - - ReplSpec dir_pat_repl[] = { - { "%B", NULL, &bindir }, -+ { "%E", NULL, &libexecdir }, - { "%L", NULL, &libdir }, - { "%V", NULL, &vardir }, - { "%C", NULL, &confdir }, -@@ -1408,12 +1410,13 @@ - - /* construct file- and dirnames */ - bindir = strapp(backuphome, FN_DIRSEPSTR "bin"); -+ libexecdir = strapp(backuphome, FN_DIRSEPSTR "libexecdir"); - vardir = strapp(backuphome, FN_DIRSEPSTR "var"); - libdir = strapp(backuphome, FN_DIRSEPSTR "lib"); - logdir = strdup(vardir); - confdir = strdup(libdir); - -- if(!bindir || !vardir || !libdir || !logdir || !confdir) -+ if(!bindir || !vardir || !libdir || !logdir || !confdir || !libexecdir) - nomemerrexit(); - - if(!paramfile) -@@ -1424,6 +1427,7 @@ - if(!backuphome){ - /* construct file- and dirnames */ - bindir = DEFBINDIR; -+ libexecdir = DEFLIBEXECDIR; - vardir = DEFVARDIR; - libdir = DEFLIBDIR; - logdir = DEFLOGDIR; -@@ -1444,13 +1448,14 @@ - } - } - ZFREE(cptr); -+ libexecdir = strapp(backuphome, FN_DIRSEPSTR "libexec/afbackup"); - vardir = strapp(backuphome, FN_DIRSEPSTR "var"); - libdir = strapp(backuphome, FN_DIRSEPSTR "lib"); - logdir = strapp(backuphome, FN_DIRSEPSTR "var"); - confdir = strapp(backuphome, FN_DIRSEPSTR "lib"); - } - -- if(!bindir || !vardir || !libdir || !logdir || !confdir) -+ if(!bindir || !vardir || !libdir || !logdir || !confdir || !libexecdir) - nomemerrexit(); - - if(!paramfile) -@@ -1522,8 +1527,8 @@ - if(!dont_compress_str) - dont_compress_str = ""; - num_dont_compress = str2wordsq(&dont_compress, dont_compress_str); -- piperprogram = strapp(bindir, FN_DIRSEPSTR "__piper"); -- zprogram = strapp(bindir, FN_DIRSEPSTR "__z"); -+ piperprogram = strapp(libexecdir, FN_DIRSEPSTR "__piper"); -+ zprogram = strapp(libexecdir, FN_DIRSEPSTR "__z"); - server_ids_file = strapp(vardir, FN_DIRSEPSTR "server_ids"); - index_ages_file = strapp(vardir, FN_DIRSEPSTR "index_ages"); - if(!paramfile || !partfile || !oldmarkfile || !orgoldmarkfile diff --git a/misc/afbackup/files/patch-ad b/misc/afbackup/files/patch-ad deleted file mode 100644 index 8eeb9f5017f5..000000000000 --- a/misc/afbackup/files/patch-ad +++ /dev/null @@ -1,38 +0,0 @@ ---- label_tape.c.orig Tue Sep 18 08:26:18 2001 -+++ label_tape.c Fri Nov 2 15:51:10 2001 -@@ -33,11 +33,13 @@ - UChar *programfile = NULL; - UChar *programdir = NULL; - UChar *bindir = NULL; -+UChar *libexecdir = NULL; - UChar *libdir = NULL; - UChar *vardir = NULL; - - ReplSpec replacements[] = { - { "%B", NULL, &bindir }, -+ { "%E", NULL, &libexecdir }, - { "%L", NULL, &libdir }, - { "%V", NULL, &vardir }, - }; -@@ -1044,11 +1046,13 @@ - if( (cptr = FN_LASTDIRDELIM(programdir)) ) - *(cptr) = '\0'; - bindir = strapp(programdir, FN_DIRSEPSTR "bin"); -+ libexecdir = strapp(programdir, FN_DIRSEPSTR "libexec/afbackup"); - libdir = strapp(programdir, FN_DIRSEPSTR "lib"); - - #else /* defined(ORIG_DEFAULTS) */ - - bindir = strdup(DEFSERVBINDIR); -+ libexecdir = strdup(DEFSERVLIBEXECDIR); - libdir = strdup(DEFSERVLIBDIR); - - #endif /* if else defined(ORIG_DEFAULTS) */ -@@ -1058,6 +1062,7 @@ - backuphome = strdup(backuphome); - /* construct file- and dirnames */ - bindir = strapp(backuphome, FN_DIRSEPSTR "bin"); -+ libexecdir = strapp(backuphome, FN_DIRSEPSTR "libexec/afbackup"); - libdir = strapp(backuphome, FN_DIRSEPSTR "lib"); - } - diff --git a/misc/afbackup/files/patch-ae b/misc/afbackup/files/patch-ae deleted file mode 100644 index ef3e6b3bbe58..000000000000 --- a/misc/afbackup/files/patch-ae +++ /dev/null @@ -1,34 +0,0 @@ ---- mserver.c.orig Fri Oct 5 16:12:58 2001 -+++ mserver.c Fri Nov 2 15:51:10 2001 -@@ -122,11 +122,13 @@ - - UChar *vardir = NULL; - UChar *bindir = NULL; -+UChar *libexecdir = NULL; - UChar *libdir = NULL; - UChar *confdir = NULL; - - ReplSpec replacements[] = { - { "%B", NULL, &bindir }, -+ { "%E", NULL, &libexecdir }, - { "%L", NULL, &libdir }, - { "%V", NULL, &vardir }, - { "%C", NULL, &confdir }, -@@ -2068,6 +2070,8 @@ - confdir = strdup(DEFSERVCONFDIR); - if(!bindir) - bindir = strdup(DEFSERVBINDIR); -+ if(!libexecdir) -+ libexecdir = strdup(DEFSERVLIBEXECDIR); - #else - if(!vardir) - vardir = strapp(backuphome, FN_DIRSEPSTR "var"); -@@ -2077,6 +2081,8 @@ - libdir = strdup(confdir); - if(!bindir) - bindir = strapp(backuphome, FN_DIRSEPSTR "bin"); -+ if(!libexecdir) -+ libexecdir = strapp(backuphome, FN_DIRSEPSTR "libexec/afbackup"); - #endif - - if(cryptfile) diff --git a/misc/afbackup/files/patch-af b/misc/afbackup/files/patch-af deleted file mode 100644 index 1c6c7a622ab7..000000000000 --- a/misc/afbackup/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- mvals.h.orig Sat Oct 21 13:27:49 2000 -+++ mvals.h Fri Nov 2 15:51:10 2001 -@@ -8,7 +8,7 @@ - #if !defined(__WATCOMC__) && !defined(__QNX__) && !defined(__MSDOS__) && !defined(__WIN32__) && !defined(_MSC_VER) - # ifdef INC_LIMITS_H - # include <limits.h> --# ifdef __OpenBSD__ -+# if defined( __OpenBSD__) || defined( __FreeBSD__) - # define MAXINT INT_MAX - # endif - # endif diff --git a/misc/afbackup/files/patch-ag b/misc/afbackup/files/patch-ag deleted file mode 100644 index 303302cc107b..000000000000 --- a/misc/afbackup/files/patch-ag +++ /dev/null @@ -1,34 +0,0 @@ ---- server.c.orig Sat Oct 6 11:37:14 2001 -+++ server.c Fri Nov 2 15:51:10 2001 -@@ -110,11 +110,13 @@ - UChar *storefile = NULL; - UChar *vardir = NULL; - UChar *bindir = NULL; -+UChar *libexecdir = NULL; - UChar *libdir = NULL; - UChar *confdir = NULL; - - ReplSpec replacements[] = { - { "%B", NULL, &bindir }, -+ { "%E", NULL, &libexecdir }, - { "%L", NULL, &libdir }, - { "%V", NULL, &vardir }, - { "%C", NULL, &confdir }, -@@ -851,6 +853,8 @@ - confdir = strdup(DEFSERVCONFDIR); - if(!bindir) - bindir = strdup(DEFSERVBINDIR); -+ if(!libexecdir) -+ libexecdir = strdup(DEFSERVLIBEXECDIR); - #else - if(!vardir) - vardir = strapp(backuphome, FN_DIRSEPSTR "var"); -@@ -860,6 +864,8 @@ - libdir = strdup(confdir); - if(!bindir) - bindir = strapp(backuphome, FN_DIRSEPSTR "bin"); -+ if(!libexecdir) -+ libexecdir = strapp(backuphome, FN_DIRSEPSTR "libexec/afbackup"); - #endif - - if(!g_lock.lockfile){ diff --git a/misc/afbackup/files/patch-ah b/misc/afbackup/files/patch-ah deleted file mode 100644 index 4d405f2d3b47..000000000000 --- a/misc/afbackup/files/patch-ah +++ /dev/null @@ -1,974 +0,0 @@ ---- CONFIG.in.orig Mon Oct 8 08:32:42 2001 -+++ CONFIG.in Fri Nov 2 15:51:10 2001 -@@ -393,8 +393,8 @@ - will be appended to it. Otherwise the file is removed before - writing. - %L will be replaced with the full path of the lib-directory -- of the server, %B with the bin-directory and %V with the -- var-directory. -+ of the server, %B with the bin-directory, %E with the libexec- -+ directory and %V with the var-directory. - - - Lock-file -@@ -776,9 +776,10 @@ - The name of a file error messages or other notable events - are written to. A dash - stands for no logging. The pattern - %V will be replaced with the full path to the var-directory, -- %B with the bin directory, %L with the lib directory, %C with -- the configuration directory (usually == %L) and %I with the -- logging directory (usually == %V) -+ %B with the bin directory, %L with the lib directory, %E with -+ the libexec directory, %C with the configuration directory, -+ (usually == %L) and %I with the logging directory (usually == -+ %V) - - - ClientIdentifier ---- afclient.conf.8.in.orig Sat Sep 15 17:36:40 2001 -+++ afclient.conf.8.in Fri Nov 2 15:51:10 2001 -@@ -279,9 +279,10 @@ - The name of a file error messages or other notable events - are written to. A dash - stands for no logging. The pattern - %V will be replaced with the full path to the var-directory, --%B with the bin directory, %L with the lib directory, %C with --the configuration directory (usually == %L) and %I with the --logging directory (usually == %V) -+%B with the bin directory, %L with the lib directory, %E with -+the libexec-directory, %C with the configuration directory -+(usually == %L) and %I with the logging directory (usually == -+%V) - .TP - .B ClientIdentifier - The identifier for the client. Default: The official hostname. ---- cartagehandler.orig Mon Jun 25 19:05:20 2001 -+++ cartagehandler Fri Nov 2 15:51:10 2001 -@@ -106,6 +106,8 @@ - set p=$p:h - set bindir="$p" - set sbindir="$p" -+ set p=$p:h -+ set libexecdir="$p/libexec/afbackup" - - setenv BACKUP_HOME "$bindir" - if ($BACKUP_HOME:t == "bin" || $BACKUP_HOME:t == "sbin") then -@@ -119,8 +121,14 @@ - if (! $?sbindir) then - set sbindir="$BACKUP_HOME/sbin" - endif -+if (! $?libexecdir) then -+ set libexecdir="$BACKUP_HOME/libexec/afbackup" -+endif - --set NUMSET="$bindir"/__numset -+set NUMSET="$libexecdir"/__numset -+if ( ! -x $NUMSET ) then -+ set NUMSET="$bindir"/__numset -+endif - if ( ! -x $NUMSET ) then - set NUMSET="$sbindir"/__numset - if ( ! -x $NUMSET ) then ---- clientconfig.in.orig Sat Oct 13 15:00:55 2001 -+++ clientconfig.in Fri Nov 2 15:51:10 2001 -@@ -446,7 +446,7 @@ - helps__15=`TN_ "This is the maximum number of index files, that will be scanned during restore. This can be helpful, if it takes too much time to scan through all index files, what is done, if restrictions are given, such as before time, after time or certain tapes. This parameter can be overridden by option -N of afrestore."` - helps__16=`TN_ "Instead of configuring the maximum number of index files to be scanned (previous parameter), their maximum age in days can be configured (floating point number allowed). This parameter can be overridden by option -O of afrestore."` - helps__17=`TN_ "When this flag is set, during restore started by a normal user (not the superuser) it is checked, whether the user has sufficient access permissions in the directory, where the files are recovered. When relocating using option -C this is default behaviour. With this flag set it will be enforced also when not relocating. This has pros and cons. It might be desirable, that users can also restore their own files in directories owned by root (e.g. at-job files or the CDE calendar stuff). On the other side this might be considered a security problem."` --helps__18=`TN_ "The name of a file error messages or other notable events are written to. A dash - stands for no logging. The pattern %V will be replaced with the full path to the var-directory, %B with the bin directory, %L with the lib directory, %C with the configuration directory (usually == %L) and %I with the logging directory (usually == %V)"` -+helps__18=`TN_ "The name of a file error messages or other notable events are written to. A dash - stands for no logging. The pattern %V will be replaced with the full path to the var-directory, %B with the bin directory, %L with the lib directory, %E with the libexec directory, %C with the configuration directory (usually == %L) and %I with the logging directory (usually == %V)"` - helps__19=`TN_ "The directory, where varying files should be put in. These files must not be deleted. The information they contain is necessary for restore."` - helps__20=`TN_ "The identifier for the client. Default: The official hostname. This entry is required, it several afbackup clients reside on one host. In this case the multi stream server must be able to distinguish the clients to distribute the pieces of backup data on tape correctly. Otherwise the data would be mixed up and be unusable by the reading client."` - helps__21=`TN_ "To prevent client programs from being started several times a lock file is created and this is it's name. For pattern replacements see LoggingFile (18)."` ---- configure.in.orig Thu Oct 18 22:50:41 2001 -+++ configure.in Fri Nov 2 15:53:56 2001 -@@ -4,6 +4,9 @@ - - PACKAGE=afbackup - VERSION=`[grep VERSION_STRING version.h|sed 's/^[^"]*"//g'|sed 's/"[^"]*$//g']` -+datadir='${prefix}/share/afbackup' -+sysconfdir='${prefix}/etc/afbackup' -+localstatedir='/var/spool/afbackup' - dnl VERSION=`[grep VERSION_STRING version.h|awk '{l=$0;while(substr(l,1,1)!="\"" && l != "")l=substr(l,2);l=substr(l,2);while(substr(l,length(l)-1,1)!="\"" && l != "") l=substr(l,1,length(l)-1);l=substr(l,1,length(l)-1);print l}']` - AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") - AC_DEFINE_UNQUOTED(VERSION, "$VERSION") -@@ -38,18 +41,17 @@ - dnl Checks for header files. - - if test `uname` = "FreeBSD" ; then -- if test -r /usr/include/values.h ; then -+ if test `uname -r` "<" '2' -a -r /usr/include/values.h ; then - ac_cv_header_values_h=yes - else - ac_cv_header_values_h=no - fi - fi - -- - AC_HEADER_DIRENT - AC_HEADER_STDC - dnl AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(arpa/inet.h fcntl.h intl/locale.h limits.h malloc.h netinet/ip.h netinet/tcp.h netinet/in_systm.h pthread.h regex.h string.h strings.h sys/acl.h sys/ioctl.h sys/mode.h sys/mount.h sys/mtio.h sys/param.h sys/resource.h sys/select.h sys/statfs.h sys/statvfs.h sys/time.h sys/timers.h sys/vfs.h sys/wait.h termios.h termio.h time.h unistd.h values.h) -+AC_CHECK_HEADERS(arpa/inet.h fcntl.h intl/locale.h limits.h malloc.h netinet/ip.h netinet/tcp.h netinet/in_systm.h pthread.h regex.h string.h strings.h sys/acl.h sys/ioctl.h sys/mode.h sys/mount.h sys/param.h sys/resource.h sys/select.h sys/statfs.h sys/statvfs.h sys/time.h sys/timers.h sys/vfs.h sys/wait.h termios.h termio.h time.h unistd.h values.h) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_STRUCT_ST_RDEV -@@ -98,61 +100,27 @@ - - AC_CHECK_TYPE(signal_t, int) - --AC_ARG_ENABLE(threads, [ --disable-threads do not configure threads], -- if test "x$enable_threads" != xyes; then enable_threads=no; fi, -- enable_threads=yes) -- --if test $enable_threads = yes ; then -- # cannot use pthread_create here, cause IRIX will fail compiling. -- # Solaris has pthread functions in libc, but they don't work, so -- # we have to check for libpthread or libthread FIRST. -- # BTW the m4 autoconf syntax constraints are terrible. -- AC_CHECK_LIB(pthread, pthread_join, libpthread=yes, libpthread=no) -- if test $libpthread = yes ; then -+# cannot use pthread_create here, cause IRIX will fail compiling. -+# Solaris has pthread functions in libc, but they don't work, so -+# we have to check for libpthread or libthread FIRST. -+# BTW the m4 autoconf syntax constraints are terrible. -+AC_CHECK_LIB(pthread, pthread_join, libpthread=yes, libpthread=no) -+if test $libpthread = yes ; then -+ AC_DEFINE(HAVE_PTHREAD_JOIN) -+ LIBS="$LIBS -lpthread" -+else -+ AC_CHECK_LIB(thread, pthread_join, libthread=yes, libthread=no) -+ if test $libthread = yes ; then -+ LIBS="$LIBS -lthread" - AC_DEFINE(HAVE_PTHREAD_JOIN) -- LIBS="$LIBS -lpthread" - else -- AC_CHECK_LIB(thread, pthread_join, libthread=yes, libthread=no) -- if test $libthread = yes ; then -- LIBS="$LIBS -lthread" -+ AC_CHECK_FUNC(pthread_join, libc=yes, libc=no) -+ if test $libc = yes ; then - AC_DEFINE(HAVE_PTHREAD_JOIN) -- else -- AC_CHECK_FUNC(pthread_join, libc=yes, libc=no) -- if test $libc = yes ; then -- AC_DEFINE(HAVE_PTHREAD_JOIN) -- else -- AC_MSG_CHECKING(for FreeBSD-like pthreads) -- LIBS_BEFORE="$LIBS" -- CPPFLAGS_BEFORE="$CPPFLAGS" -- LIBS="$LIBS -pthread" -- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" -- AC_CACHE_VAL(ac_cv_decl_freebsd_pthreads, -- [AC_TRY_LINK([ --#include <stdio.h> --#include <errno.h> --#ifdef HAVE_STDLIB_H --#include <stdlib.h> --#endif --#ifdef HAVE_UNISTD_H --#include <unistd.h> --#endif],[pthread_join();], -- ac_cv_decl_freebsd_pthreads=yes, ac_cv_decl_freebsd_pthreads=no) -- ]) -- AC_MSG_RESULT($ac_cv_decl_freebsd_pthreads) -- if test $ac_cv_decl_freebsd_pthreads = yes; then -- AC_DEFINE(HAVE_PTHREAD_JOIN) -- SYSDEFINES="$SYSDEFINES -D_THREAD_SAFE" -- else -- LIBS="$LIBS_BEFORE" -- CPPFLAGS="$CPPFLAGS_BEFORE" -- fi -- fi - fi - fi - fi - --AC_SUBST(SYSDEFINES) -- - checkBoth=0 - AC_CHECK_FUNC(connect, checkSocket=0, checkSocket=1) - if test "$checkSocket" = 1; then -@@ -165,7 +133,7 @@ - fi - AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) - --AC_CHECK_FUNCS(bsearch door_create drand48 getcwd gettimeofday inet_ntoa isatty isnan lchown lfind lsearch memmove mkdir mkfifo mktime qsort rand re_comp regcomp re_compile_pattern rint seed48 select seteuid setreuid setresuid setegid setregid setresgid setitimer sighold sigrelse socket strcasecmp strncasecmp strcasestr strdup strerror strrstr strstr timer_create uname acl setacl chacl sys_errlist stat64 statvfs vsnprintf vsyslog) -+AC_CHECK_FUNCS(bsearch drand48 getcwd gettimeofday inet_ntoa isatty isnan lchown lfind lsearch memmove mkdir mkfifo mktime qsort rand re_comp regcomp re_compile_pattern rint select setitimer sighold sigrelse socket strcasecmp strncasecmp strcasestr strdup strerror strrstr strstr timer_create uname acl setacl chacl sys_errlist stat64 statvfs vsnprintf vsyslog) - AC_CHECK_LIB(acl, acl_get_file, acl_get_file=yes, acl_get_file=no) - if test $acl_get_file = yes ; then - LIBS="$LIBS -lacl" -@@ -190,17 +158,15 @@ - test "x$prefix" = xNONE && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix=${prefix} - -- -- - AC_ARG_WITH(utilslibdir, - [ --with-utilslibdir=DIR server configuration files in DIR [prefix/lib]], - [ -- if test "$withval"; then -- utilslibdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-utilslibdir -+ if test "$withval"; then -+ utilslibdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-utilslibdir - option.]) -- fi -+ fi - ] - ) - : ${utilslibdir:='$prefix/lib'} -@@ -211,12 +177,12 @@ - AC_ARG_WITH(utilsincdir, - [ --with-utilsincdir=DIR server configuration files in DIR [prefix/include]], - [ -- if test "$withval"; then -- utilsincdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-utilsincdir -+ if test "$withval"; then -+ utilsincdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-utilsincdir - option.]) -- fi -+ fi - ] - ) - : ${utilsincdir:='$prefix/include'} -@@ -227,12 +193,12 @@ - AC_ARG_WITH(utilsbindir, - [ --with-utilsbindir=DIR server configuration files in DIR [prefix/bin]], - [ -- if test "$withval"; then -- utilsbindir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-utilsbindir -+ if test "$withval"; then -+ utilsbindir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-utilsbindir - option.]) -- fi -+ fi - ] - ) - : ${utilsbindir:='$prefix/bin'} -@@ -245,12 +211,12 @@ - AC_ARG_WITH(prefixext, - [ --with-prefixext=YESNO extend prefix with /backup [yes]], - [ -- if test "$withval"; then -- prefixext="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-prefixext -+ if test "$withval"; then -+ prefixext="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-prefixext - option.]) -- fi -+ fi - ] - ) - subdir="/backup" -@@ -262,12 +228,12 @@ - AC_ARG_WITH(serverdir, - [ --with-serverdir=DIR server installation in DIR [prefix/subdir/server]], - [ -- if test "$withval"; then -- serverdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-serverdir -+ if test "$withval"; then -+ serverdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-serverdir - option.]) -- fi -+ fi - ] - ) - : ${serverdir:='$prefix$subdir/server'} -@@ -279,12 +245,12 @@ - AC_ARG_WITH(serverbindir, - [ --with-serverbindir=DIR server binaries in DIR [serverdir/bin]], - [ -- if test "$withval"; then -- serverbindir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-serverbindir -+ if test "$withval"; then -+ serverbindir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-serverbindir - option.]) -- fi -+ fi - ] - ) - : ${serverbindir:='$serverdir/bin'} -@@ -296,12 +262,12 @@ - AC_ARG_WITH(serverlibdir, - [ --with-serverlibdir=DIR server configuration files in DIR [serverdir/lib]], - [ -- if test "$withval"; then -- serverlibdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-serverlibdir -+ if test "$withval"; then -+ serverlibdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-serverlibdir - option.]) -- fi -+ fi - ] - ) - : ${serverlibdir:='$serverdir/lib'} -@@ -313,12 +279,12 @@ - AC_ARG_WITH(serverconfdir, - [ --with-serverconfdir=DIR server configuration files in DIR [serverdir/lib]], - [ -- if test "$withval"; then -- serverconfdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-serverconfdir -+ if test "$withval"; then -+ serverconfdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-serverconfdir - option.]) -- fi -+ fi - ] - ) - : ${serverconfdir:='$serverdir/lib'} -@@ -330,12 +296,12 @@ - AC_ARG_WITH(servervardir, - [ --with-servervardir=DIR variable server files in DIR [serverdir/var]], - [ -- if test "$withval"; then -- servervardir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-servervardir -+ if test "$withval"; then -+ servervardir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-servervardir - option.]) -- fi -+ fi - ] - ) - : ${servervardir:='$serverdir/var'} -@@ -347,12 +313,12 @@ - AC_ARG_WITH(servermandir, - [ --with-servermandir=DIR variable server files in DIR [serverdir/man]], - [ -- if test "$withval"; then -- servermandir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-servermandir -+ if test "$withval"; then -+ servermandir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-servermandir - option.]) -- fi -+ fi - ] - ) - : ${servermandir:='$serverdir/man'} -@@ -364,12 +330,12 @@ - AC_ARG_WITH(serverlogdir, - [ --with-serverlogdir=DIR server log files in DIR [serverdir/var]], - [ -- if test "$withval"; then -- serverlogdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-serverlogdir -+ if test "$withval"; then -+ serverlogdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-serverlogdir - option.]) -- fi -+ fi - ] - ) - : ${serverlogdir:='$serverdir/var'} -@@ -382,12 +348,12 @@ - AC_ARG_WITH(clientdir, - [ --with-clientdir=DIR client installation in DIR [prefix/subdir/client]], - [ -- if test "$withval"; then -- clientdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-clientdir -+ if test "$withval"; then -+ clientdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-clientdir - option.]) -- fi -+ fi - ] - ) - : ${clientdir:='$prefix$subdir/client'} -@@ -399,12 +365,12 @@ - AC_ARG_WITH(clientbindir, - [ --with-clientbindir=DIR client binaries in DIR [clientdir/bin]], - [ -- if test "$withval"; then -- clientbindir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-clientbindir -+ if test "$withval"; then -+ clientbindir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-clientbindir - option.]) -- fi -+ fi - ] - ) - : ${clientbindir:='$clientdir/bin'} -@@ -416,12 +382,12 @@ - AC_ARG_WITH(clientlibdir, - [ --with-clientlibdir=DIR client configuration files in DIR [clientdir/lib]], - [ -- if test "$withval"; then -- clientlibdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-clientlibdir -+ if test "$withval"; then -+ clientlibdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-clientlibdir - option.]) -- fi -+ fi - ] - ) - : ${clientlibdir:='$clientdir/lib'} -@@ -429,16 +395,33 @@ - eval echo "$clientlibdir" - )` - AC_SUBST(clientlibdir) -+dnl *** clientconfdir -+AC_ARG_WITH(clientconfdir, -+ [ --with-clientconfdir=DIR client configuration files in DIR [clientdir/lib]], -+ [ -+ if test "$withval"; then -+ clientconfdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-clientconfdir -+ option.]) -+ fi -+ ] -+) -+: ${clientconfdir:='$clientdir/lib'} -+clientconfdir=`( -+ eval echo "$clientconfdir" -+)` -+AC_SUBST(clientconfdir) - dnl *** clientvardir - AC_ARG_WITH(clientvardir, - [ --with-clientvardir=DIR variable client files in DIR [clientdir/var]], - [ -- if test "$withval"; then -- clientvardir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-clientvardir -+ if test "$withval"; then -+ clientvardir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-clientvardir - option.]) -- fi -+ fi - ] - ) - : ${clientvardir:='$clientdir/var'} -@@ -450,12 +433,12 @@ - AC_ARG_WITH(clientmandir, - [ --with-clientmandir=DIR variable client files in DIR [clientdir/man]], - [ -- if test "$withval"; then -- clientmandir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-clientmandir -+ if test "$withval"; then -+ clientmandir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-clientmandir - option.]) -- fi -+ fi - ] - ) - : ${clientmandir:='$clientdir/man'} -@@ -467,12 +450,12 @@ - AC_ARG_WITH(clientlogdir, - [ --with-clientlogdir=DIR client log files in DIR [clientdir/var]], - [ -- if test "$withval"; then -- clientlogdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-clientlogdir -+ if test "$withval"; then -+ clientlogdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-clientlogdir - option.]) -- fi -+ fi - ] - ) - : ${clientlogdir:='$clientdir/var'} -@@ -484,12 +467,12 @@ - AC_ARG_WITH(rexecdir, - [ --with-rexecdir=DIR binaries for remote execution in DIR [prefix/rexec]], - [ -- if test "$withval"; then -- REXECDIR="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-rexecdir -+ if test "$withval"; then -+ REXECDIR="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-rexecdir - option.]) -- fi -+ fi - ] - ) - : ${REXECDIR:='$prefix$subdir/rexec'} -@@ -501,12 +484,12 @@ - AC_ARG_WITH(clientconf, - [ --with-clientconf=NAME NAME for client configuration [backup.conf]], - [ -- if test "$withval"; then -- clientconf="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-clientconf -+ if test "$withval"; then -+ clientconf="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-clientconf - option.]) -- fi -+ fi - ] - ) - : ${clientconf:=backup.conf} -@@ -518,12 +501,12 @@ - AC_ARG_WITH(serverconf, - [ --with-serverconf=NAME NAME for server configuration [backup.conf]], - [ -- if test "$withval"; then -- serverconf="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-serverconf -+ if test "$withval"; then -+ serverconf="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-serverconf - option.]) -- fi -+ fi - ] - ) - : ${serverconf:=backup.conf} -@@ -535,12 +518,12 @@ - AC_ARG_WITH(commondir, - [ --with-commondir=DIR software for client and server will reside in DIR [prefix/common]], - [ -- if test "$withval"; then -- commondir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-commondir -+ if test "$withval"; then -+ commondir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-commondir - option.]) -- fi -+ fi - ] - ) - : ${commondir:='$prefix$subdir/common'} -@@ -552,12 +535,12 @@ - AC_ARG_WITH(commondatadir, - [ --with-commondatadir=DIR architecture independent data for client and server will reside in DIR [commondir/share]], - [ -- if test "$withval"; then -- commondatadir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-commondatadir -+ if test "$withval"; then -+ commondatadir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-commondatadir - option.]) -- fi -+ fi - ] - ) - : ${commondatadir:='$commondir/share'} -@@ -569,12 +552,12 @@ - AC_ARG_WITH(commonshlibdir, - [ --with-commonshlibdir=DIR architecture independent program text for client and server will reside in DIR [commondatadir/lib]], - [ -- if test "$withval"; then -- commonshlibdir="$withval" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-commonshlibdir -+ if test "$withval"; then -+ commonshlibdir="$withval" -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-commonshlibdir - option.]) -- fi -+ fi - ] - ) - : ${commonshlibdir:='$commondatadir/lib'} -@@ -590,7 +573,7 @@ - AC_ARG_WITH(des, - [ --with-des for client/server authentication [no]], - [ -- usedes=yes -+ usedes=yes - des_include=../libdes - des_libdir=`echo $des_include|sed 's#include$#lib#g'` - des_header=des.h -@@ -601,43 +584,43 @@ - AC_ARG_WITH(des-include, - [ --with-des-include=DIR des header file in DIR [../libdes]], - [ -- if test "$withval"; then -- usedes=yes -- des_include="$withval" -+ if test "$withval"; then -+ usedes=yes -+ des_include="$withval" - des_libdir="$des_include" - des_header=des.h - des_ldflag=-ldes -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-des-include -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-des-include - option.]) -- fi -+ fi - ] - ) - - AC_ARG_WITH(des-header, - [ --with-des-header=NAME NAME is des header file [des.h]], - [ -- if test "$withval"; then -- usedes=yes -- des_header="$withval" -+ if test "$withval"; then -+ usedes=yes -+ des_header="$withval" - des_ldflag=-ldes - if test _"$des_include" = _ ; then - des_include=../libdes - des_libdir="$des_include" - fi -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-des-header -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-des-header - option.]) -- fi -+ fi - ] - ) - - AC_ARG_WITH(des-libdir, - [ --with-des-libdir=DIR des library is in DIR [../libdes]], - [ -- if test "$withval"; then -- usedes=yes -- des_libdir="$withval" -+ if test "$withval"; then -+ usedes=yes -+ des_libdir="$withval" - des_ldflag=-ldes - if test _"$des_include" = _ ; then - des_include="$des_libdir" -@@ -645,19 +628,19 @@ - if test _"$des_header" = _ ; then - des_header="des.h" - fi -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-des-libdir -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-des-libdir - option.]) -- fi -+ fi - ] - ) - - AC_ARG_WITH(des-ldflag, - [ --with-des-ldflag=LIB des library is specified by LIB [-ldes]], - [ -- if test "$withval"; then -- usedes=yes -- des_ldflag="$withval" -+ if test "$withval"; then -+ usedes=yes -+ des_ldflag="$withval" - if test _"$des_include" = _ ; then - des_include=../libdes - fi -@@ -667,10 +650,10 @@ - if test _"$des_libdir" = _ ; then - des_libdir="$des_include" - fi -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-des-ldflag -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-des-ldflag - option.]) -- fi -+ fi - ] - ) - -@@ -708,7 +691,7 @@ - AC_ARG_WITH(zlib, - [ --with-zlib for builtin compression [no]], - [ -- usezlib=yes -+ usezlib=yes - zlib_include=/usr/local/include - zlib_libdir=`echo $zlib_include|sed 's#include$#lib#g'` - ] -@@ -717,30 +700,30 @@ - AC_ARG_WITH(zlib-include, - [ --with-zlib-include=DIR zlib header file in DIR [/usr/local/include]], - [ -- if test "$withval"; then -- usezlib=yes -- zlib_include="$withval" -+ if test "$withval"; then -+ usezlib=yes -+ zlib_include="$withval" - zlib_libdir="$zlib_include" -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-zlib-include -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-zlib-include - option.]) -- fi -+ fi - ] - ) - - AC_ARG_WITH(zlib-libdir, - [ --with-zlib-libdir=DIR zlib library is in DIR [/usr/local/lib]], - [ -- if test "$withval"; then -- usezlib=yes -- zlib_libdir="$withval" -+ if test "$withval"; then -+ usezlib=yes -+ zlib_libdir="$withval" - if test _"$zlib_include" = _ ; then - zlib_include="$zlib_libdir" - fi -- else -- AC_MSG_WARN([*** You must supply an argument to the --with-zlib-libdir -+ else -+ AC_MSG_WARN([*** You must supply an argument to the --with-zlib-libdir - option.]) -- fi -+ fi - ] - ) - ---- server.conf.changer.orig Mon Jun 25 19:03:19 2001 -+++ server.conf.changer Fri Nov 2 15:51:10 2001 -@@ -63,10 +63,10 @@ - # %m by the number, if the count starts with 0. - # - # Command to set the file # on tape --SetFile-Command: sh -c "mt -f %d rewind && %B/__mt -f %d fsf %m" -+SetFile-Command: sh -c "mt -f %d rewind && %E/__mt -f %d fsf %m" - # - # Command to skip to the next %n-th file on tape --SkipFiles-Command: %B/__mt -f %d fsf %n -+SkipFiles-Command: %E/__mt -f %d fsf %n - # - # If there is a command to set the cartridge directly, use it here - Setcart-Command: %B/cart_ctl -F -m -C %n -D -@@ -81,7 +81,7 @@ - #InitMedia-Command: - # - # Command, that is called, when a tape is full --#TapeFull-Command: %B/cartagehandler %c %n %C -+#TapeFull-Command: %E/cartagehandler %c %n %C - # - # The command to erase the tape. This is necessary on some systems. - #Erasetape-Command: exit 0 ---- server.conf.dir.orig Mon Jun 25 19:02:48 2001 -+++ server.conf.dir Fri Nov 2 15:51:10 2001 -@@ -126,7 +126,7 @@ - # CONFIGURATION FOR REMOTE_EXECUTION - # - # Directory, where remotely started programs must reside --Program-Directory: %B/../rexec -+Program-Directory: %E - # - # - # SERVER-STARTUP AND SHUTDOWN ACTIONS ---- server.conf.dirsl.orig Mon Jun 25 19:03:04 2001 -+++ server.conf.dirsl Fri Nov 2 15:51:10 2001 -@@ -69,7 +69,7 @@ - SetFile-Command: /bin/rm -f %d;touch %d.%m; ln -s %d.%m %d; exit 0 - # - # Command to skip to the next %n-th file on tape --SkipFiles-Command: %B/__inc_link -s %d %n -+SkipFiles-Command: %E/__inc_link -s %d %n - # - # If there is a command to set the cartridge directly, supply it here - Set-Cart-Command: /bin/rm -f /var/backup/vol; mkdir -p /var/backup/vol.%n ; ln -s vol.%n /var/backup/vol ; touch %d.0 ; /bin/rm -f %d ; ln -s data.0 %d ; exit 0 -@@ -126,7 +126,7 @@ - # CONFIGURATION FOR REMOTE_EXECUTION - # - # Directory, where remotely started programs must reside --Program-Directory: %B/../rexec -+Program-Directory: %E - # - # - # SERVER-STARTUP AND SHUTDOWN ACTIONS ---- server.conf.in.orig Tue Sep 25 08:36:27 2001 -+++ server.conf.in Fri Nov 2 15:51:10 2001 -@@ -66,10 +66,10 @@ - # %m by the number, if the count starts with 0. - # - # Command to set the file # on tape --SetFile-Command: sh -c "mt -f %d rewind && %B/__mt -f %d fsf %m" -+SetFile-Command: sh -c "mt -f %d rewind && %E/__mt -f %d fsf %m" - # - # Command to skip to the next %n-th file on tape --SkipFiles-Command: %B/__mt -f %d fsf %n -+SkipFiles-Command: %E/__mt -f %d fsf %n - # - # If there is a command to set the cartridge directly, use it here - #Setcart-Command: %B/cart_ctl -F -m -C %n -D -@@ -84,7 +84,7 @@ - #InitMedia-Command: - # - # Command, that is called, when a tape is full --#TapeFull-Command: %B/cartagehandler %c %n %C -+#TapeFull-Command: %E/cartagehandler %c %n %C - # - # The command to erase the tape. This is necessary on some systems. - #Erasetape-Command: exit 0 ---- server.conf.manual.orig Mon Jun 25 19:03:28 2001 -+++ server.conf.manual Fri Nov 2 15:51:10 2001 -@@ -63,10 +63,10 @@ - # %m by the number, if the count starts with 0. - # - # Command to set the file # on tape --SetFile-Command: sh -c "mt -f %d rewind && %B/__mt -f %d fsf %m" -+SetFile-Command: sh -c "mt -f %d rewind && %E/__mt -f %d fsf %m" - # - # Command to skip to the next %n-th file on tape --SkipFiles-Command: %B/__mt -f %d fsf %n -+SkipFiles-Command: %E/__mt -f %d fsf %n - # - # If there is a command to set the cartridge directly, use it here - #Setcart-Command: %B/cart_ctl -F -m -C %n -D -@@ -81,7 +81,7 @@ - #InitMedia-Command: - # - # Command, that is called, when a tape is full --#TapeFull-Command: %B/cartagehandler %c %n %C -+#TapeFull-Command: %E/cartagehandler %c %n %C - # - # The command to erase the tape. This is necessary on some systems. - #Erasetape-Command: exit 0 ---- serverconfig.in.orig Sat Oct 13 15:01:04 2001 -+++ serverconfig.in Fri Nov 2 15:51:10 2001 -@@ -439,7 +439,7 @@ - helps__14=`TN_ "If the streaming device is not accessible (i.e. an open or a tape handling command fails) or another backup server process is still running, the server process re-tries his attempts regularly. If it fails longer than the time in minutes supplied here, an e-mail is sent to the configured user in charge (see: User To Inform). Supplying 0 means: never send mail."` - helps__15=`TN_ "If the streaming device is not accessible (i.e. an open or a tape handling command fails), the server process re-tries his attempts regularly. If it fails longer than the time in minutes supplied here, it exits silently leaving a warning in the log file. Supplying 0 means: try forever, never exit."` - helps__16=`TN_ "This is the interval in seconds, after that regularly the device is probed to be ready for reading. Thus after having ejected a cartridge it is automatically recognized, if a new cartridge has been inserted. For other media (e.g. exchangeable disks) this may not be suitable. Supply a 0 in these cases for no probing."` --helps__17=`TN_ "If a media changer is available and it should be used, this is the file to configure it. It must contain specifications of the commands, that are driving the media changer. %L will be replaced with the full path of the lib-directory of the server, %B with the bin-directory and %V with the var-directory. See the manual pages of cart_ctl, how to setup the media changer operation."` -+helps__17=`TN_ "If a media changer is available and it should be used, this is the file to configure it. It must contain specifications of the commands, that are driving the media changer. %L will be replaced with the full path of the lib-directory of the server, %B with the bin-directory, %E with the libexec-directory and %V with the var-directory. See the manual pages of cart_ctl, how to setup the media changer operation."` - helps__18=`TN_ "This is the (shell-) command to run to position the tape to a certain file. Usually this is something like a combination of: mt -f <device> rewind and mt -f <device> fsf <number>. If the command you are supplying here starts to count with 1 for the first file on tape, you should insert %n for the <number>. If it starts with 0, replace <number> with %m. If you don't want to type the devicename again here, you may write %d instead. For more pattern replacements see Changer-Configuration-File (17)."` - helps__19=`TN_ "This is the (shell-) command to run to skip over to a file later on tape. Usually this is something like\nmt -f <device> fsf <number>\nInsert %n, where the number of files to skip over must be supplied in the command, in the example instead of <number>, and %d, where the device should appear (here: <device>). For more pattern replacements see Changer-Configuration-File (17)."` - helps__20=`TN_ "This is the (shell-) command to run to put a certain cartridge into the device. If the command you are supplying here starts to count with 1 for the first cartridge, you should insert %n in the place, where the cartridge number must appear. If it starts with 0, replace it with %m. If you don't want to type the devicename again here, you may write %d instead. If you don't have a command to perform this task, don't supply anything here. In this case you must set your cartridge handling system to sequential mode (automatically putting the next cartridge in, when the current one is ejected). For more pattern replacements see Changer-Configuration-File (17)."` ---- xcc.in.orig Thu Sep 13 08:26:58 2001 -+++ xcc.in Fri Nov 2 15:51:10 2001 -@@ -217,7 +217,7 @@ - set helps(15) [ TN_ "This is the maximum number of index files, that will be scanned during restore. This can be helpful, if it takes too much time to scan through all index files, what is done, if restrictions are given, such as before time, after time or certain tapes. This parameter can be overridden by option -N of afrestore." ] - set helps(16) [ TN_ "Instead of configuring the maximum number of index files to be scanned (previous parameter), their maximum age in days can be configured (floating point number allowed). This parameter can be overridden by option -O of afrestore." ] - set helps(17) [ TN_ "When this flag is set, during restore started by a normal user (not the superuser) it is checked, whether the user has sufficient access permissions in the directory, where the files are recovered. When relocating using option -C this is default behaviour. With this flag set it will be enforced also when not relocating. This has pros and cons. It might be desirable, that users can also restore their own files in directories owned by root (e.g. at-job files or the CDE calendar stuff). On the other side this might be considered a security problem." ] --set helps(18) [ TN_ "The name of a file error messages or other notable events are written to. A dash - stands for no logging. The pattern %V will be replaced with the full path to the var-directory, %B with the bin directory, %L with the lib directory, %C with the configuration directory (usually == %L) and %I with the logging directory (usually == %V)" ] -+set helps(18) [ TN_ "The name of a file error messages or other notable events are written to. A dash - stands for no logging. The pattern %V will be replaced with the full path to the var-directory, %B with the bin directory, %E with the libexec directory, %L with the lib directory, %C with the configuration directory (usually == %L) and %I with the logging directory (usually == %V)" ] - set helps(19) [ TN_ "The directory, where varying files should be put in. These files must not be deleted. The information they contain is necessary for restore." ] - set helps(20) [ TN_ "The identifier for the client. Default: The official hostname. This entry is required, it several afbackup clients reside on one host. In this case the multi stream server must be able to distinguish the clients to distribute the pieces of backup data on tape correctly. Otherwise the data would be mixed up and be unusable by the reading client." ] - set helps(21) [ TN_ "To prevent client programs from being started several times a lock file is created and this is it's name. For pattern replacements see LoggingFile (18)." ] ---- xrs.in.orig Mon Aug 27 23:35:43 2001 -+++ xrs.in Fri Nov 2 15:51:10 2001 -@@ -17,7 +17,8 @@ - # user settable section - - set BACKUP_HOME_DEFAULT $env(BACKUP_HOME_DEFAULT) --set BINDIR "@clientbindir@" -+set BINDIR "@bindir@" -+set LIBEXECDIR "@libexecdir@" - - set poss_binsubs { bin sbin "" } - -@@ -29,6 +30,7 @@ - set BINDIR "$BACKUP_HOME/$binsub" - } - } -+ set LIBEXECDIR "$BACKUP_HOME/libexec/afbackup" - } - set found 0 - set configfiles "$BACKUP_HOME_DEFAULT/lib/backup.conf /etc/buclient.conf /etc/afbuclient.conf /etc/afclient.conf /etc/afbackup/client.conf" -@@ -44,7 +46,7 @@ - set cmdprefixlast [ expr [ string length $CMDPREFIX ] - 1 ] - - set restoreprog "$BINDIR/afrestore" --set packprog "$BINDIR/__packpats" -+set packprog "$LIBEXECDIR/__packpats" - - source "@commonshlibdir@/aftcllib.tcl" - ---- xsc.in.orig Mon Oct 8 08:39:07 2001 -+++ xsc.in Fri Nov 2 15:51:10 2001 -@@ -232,7 +232,7 @@ - set helps(14) [ TN_ "If the streaming device is not accessible (i.e. an open or a tape handling command fails) or another backup server process is still running, the server process re-tries his attempts regularly. If it fails longer than the time in minutes supplied here, an e-mail is sent to the configured user in charge (see: User To Inform). Supplying 0 means: never send mail." ] - set helps(15) [ TN_ "If the streaming device is not accessible (i.e. an open or a tape handling command fails), the server process re-tries his attempts regularly. If it fails longer than the time in minutes supplied here, it exits silently leaving a warning in the log file. Supplying 0 means: try forever, never exit." ] - set helps(16) [ TN_ "This is the interval in seconds, after that regularly the device is probed to be ready for reading. Thus after having ejected a cartridge it is automatically recognized, if a new cartridge has been inserted. For other media (e.g. exchangeable disks) this may not be suitable. Supply a 0 in these cases for no probing." ] --set helps(17) [ TN_ "If a media changer is available and it should be used, this is the file to configure it. It must contain specifications of the commands, that are driving the media changer. %L will be replaced with the full path of the lib-directory of the server, %B with the bin-directory and %V with the var-directory. See the manual pages of cart_ctl, how to setup the media changer operation." ] -+set helps(17) [ TN_ "If a media changer is available and it should be used, this is the file to configure it. It must contain specifications of the commands, that are driving the media changer. %L will be replaced with the full path of the lib-directory of the server, %B with the bin-directory, %E with the libexec-directory and %V with the var-directory. See the manual pages of cart_ctl, how to setup the media changer operation." ] - set helps(18) [ TN_ "This is the (shell-) command to run to position the tape to a certain file. Usually this is something like a combination of: mt -f <device> rewind and mt -f <device> fsf <number>. If the command you are supplying here starts to count with 1 for the first file on tape, you should insert %n for the <number>. If it starts with 0, replace <number> with %m. If you don't want to type the devicename again here, you may write %d instead. For more pattern replacements see Changer-Configuration-File (17)." ] - set helps(19) [ TN_ "This is the (shell-) command to run to skip over to a file later on tape. Usually this is something like\nmt -f <device> fsf <number>\nInsert %n, where the number of files to skip over must be supplied in the command, in the example instead of <number>, and %d, where the device should appear (here: <device>). For more pattern replacements see Changer-Configuration-File (17)." ] - set helps(20) [ TN_ "This is the (shell-) command to run to put a certain cartridge into the device. If the command you are supplying here starts to count with 1 for the first cartridge, you should insert %n in the place, where the cartridge number must appear. If it starts with 0, replace it with %m. If you don't want to type the devicename again here, you may write %d instead. If you don't have a command to perform this task, don't supply anything here. In this case you must set your cartridge handling system to sequential mode (automatically putting the next cartridge in, when the current one is ejected). For more pattern replacements see Changer-Configuration-File (17)." ] ---- xss.in.orig Wed May 23 08:47:17 2001 -+++ xss.in Fri Nov 2 15:51:10 2001 -@@ -81,6 +81,7 @@ - { "%L" "libdir" "lib" "@serverlibdir@" } - { "%I" "logdir" "var" "@serverlogdir@" } - { "%B" "bindir" "bin" "@serverbindir@" } -+ { "%E" "libexecdir" "libexec" "@serverbindir@" } - { "%C" "confdir" "lib" "@serverconfdir@" } - } - diff --git a/misc/afbackup/files/patch-ai b/misc/afbackup/files/patch-ai deleted file mode 100644 index 3e4677770e09..000000000000 --- a/misc/afbackup/files/patch-ai +++ /dev/null @@ -1,31 +0,0 @@ ---- budefs.h.in.orig Wed Jul 25 17:26:03 2001 -+++ budefs.h.in Fri Nov 2 15:51:10 2001 -@@ -109,11 +109,13 @@ - #define SERVERMODE_VARAPPEND 1 - - #define DEFBINDIR "@clientbindir@" -+#define DEFLIBEXECDIR "@libexecdir@" - #define DEFVARDIR "@clientvardir@" - #define DEFLIBDIR "@clientlibdir@" - #define DEFLOGDIR "@clientlogdir@" --#define DEFCONFDIR "@clientlibdir@" -+#define DEFCONFDIR "@clientconfdir@" - #define DEFSERVBINDIR "@serverbindir@" -+#define DEFSERVLIBEXECDIR "@libexecdir@" - #define DEFSERVVARDIR "@servervardir@" - #define DEFSERVLIBDIR "@serverlibdir@" - #define DEFSERVCONFDIR "@serverconfdir@" -@@ -227,11 +229,13 @@ - 2048, 1024, 512, 32768, 65536, 10240, 8192, 131072 - - #define DEFAULT_CLIENT_CONFIGFILES \ -+ "@clientconfdir@/client.conf", \ - "/etc/buclient.conf", \ - "/etc/afbuclient.conf", \ - "/etc/afclient.conf", \ - "/etc/afbackup/client.conf" - #define DEFAULT_SERVER_CONFIGFILES \ -+ "@serverconfdir@/server.conf", \ - "/etc/buserver.conf", \ - "/etc/afbuserver.conf", \ - "/etc/afserver.conf", \ diff --git a/misc/afbackup/files/patch-aj b/misc/afbackup/files/patch-aj deleted file mode 100644 index c5d60559655d..000000000000 --- a/misc/afbackup/files/patch-aj +++ /dev/null @@ -1,42 +0,0 @@ ---- sysutils.c.orig Wed Sep 12 20:29:45 2001 -+++ sysutils.c Mon Jan 21 21:55:47 2002 -@@ -37,6 +37,9 @@ - #include <grp.h> - #include <sysutils.h> - #include <fileutil.h> -+#ifdef __FreeBSD__ -+#include <sys/sysctl.h> -+#endif - - #define GETOUT { goto getout; } - #define CLEANUP { goto cleanup; } -@@ -763,9 +766,20 @@ - Int32 - free_fds() - { -- int *fds = NULL, *newfds = NULL, fd; - Int32 num_fds = 0; - -+#ifdef __FreeBSD__ -+ /* This code is for avoiding race conditions with other processes which -+ * might need a spare file descriptor while afbackup tries to find out -+ * how many of those it can use. sysctl gives us more general yet less -+ * reliable answer as it is does not count on a number of possibly -+ * opened files. */ -+ size_t sz = sizeof( Int32); -+ -+ sysctlbyname( "kern.maxfilesperproc", &num_fds, &sz, NULL, 0); -+#else -+ int *fds = NULL, *newfds = NULL, fd; -+ - while((fd = open(NULLDEV, O_RDONLY)) >= 0){ - newfds = ZSRENEWP(fds, int, num_fds + 1, num_fds); - -@@ -784,6 +798,7 @@ - close(fds[fd]); - - free(fds); -+#endif - - return(num_fds); - } diff --git a/misc/afbackup/files/patch-utils.h b/misc/afbackup/files/patch-utils.h deleted file mode 100644 index 5553d85bde03..000000000000 --- a/misc/afbackup/files/patch-utils.h +++ /dev/null @@ -1,10 +0,0 @@ ---- utils.h.orig Sat Jun 28 02:00:49 2003 -+++ utils.h Sat Jun 28 02:04:23 2003 -@@ -10,6 +10,8 @@ - #include <string.h> - #include <math.h> - #include <x_types.h> -+#include <time.h> -+#include <sys/types.h> - - #define NO_ERROR 0 diff --git a/misc/afbackup/files/pkg-plist.autokey b/misc/afbackup/files/pkg-plist.autokey deleted file mode 100644 index 5584daf6335c..000000000000 --- a/misc/afbackup/files/pkg-plist.autokey +++ /dev/null @@ -1 +0,0 @@ -etc/afbackup/cryptkey diff --git a/misc/afbackup/files/pkg-plist.client b/misc/afbackup/files/pkg-plist.client deleted file mode 100644 index 7d3738440a66..000000000000 --- a/misc/afbackup/files/pkg-plist.client +++ /dev/null @@ -1,25 +0,0 @@ -sbin/afclient -@exec ln -sf %B/%f %B/afbackup -@unexec rm -f %B/afbackup -sbin/full_backup -@exec ln -sf %B/%f %B/afbackout -@exec ln -sf %B/%f %B/afrestore -@exec ln -sf %B/%f %B/afverify -@exec ln -sf %B/%f %B/copy_tape -@exec ln -sf %B/%f %B/incr_backup -@exec ln -sf %B/%f %B/update_indexes -@unexec rm -f %B/afbackout -@unexec rm -f %B/afrestore -@unexec rm -f %B/afverify -@unexec rm -f %B/copy_tape -@unexec rm -f %B/incr_backup -@unexec rm -f %B/update_indexes -sbin/afclientconfig -@exec ln -sf %B/%f %B/clientconfig -@unexec rm -f %B/clientconfig -sbin/autocptapes -libexec/afbackup/__packpats -libexec/afbackup/__piper -libexec/afbackup/__z -share/afbackup/lib/aftcllib.tcl -etc/afbackup/client.conf.sample diff --git a/misc/afbackup/files/pkg-plist.desclient b/misc/afbackup/files/pkg-plist.desclient deleted file mode 100644 index e935cb420010..000000000000 --- a/misc/afbackup/files/pkg-plist.desclient +++ /dev/null @@ -1 +0,0 @@ -libexec/afbackup/__descrpt diff --git a/misc/afbackup/files/pkg-plist.fixedorder b/misc/afbackup/files/pkg-plist.fixedorder deleted file mode 100644 index ea8acd32a5c3..000000000000 --- a/misc/afbackup/files/pkg-plist.fixedorder +++ /dev/null @@ -1,9 +0,0 @@ -@dirrm libexec/afbackup -@dirrm share/afbackup/lib -@dirrm share/afbackup/locale/it/LC_MESSAGES -@dirrm share/afbackup/locale/it -@dirrm share/afbackup/locale/de/LC_MESSAGES -@dirrm share/afbackup/locale/de -@dirrm share/afbackup/locale -@dirrm share/afbackup -@dirrm etc/afbackup diff --git a/misc/afbackup/files/pkg-plist.guiclient b/misc/afbackup/files/pkg-plist.guiclient deleted file mode 100644 index d2597f331821..000000000000 --- a/misc/afbackup/files/pkg-plist.guiclient +++ /dev/null @@ -1,6 +0,0 @@ -sbin/xafclientconfig -@exec ln -sf %B/%f %B/xclientconfig -@unexec rm -f %B/xclientconfig -sbin/xafrestore -@exec ln -sf %B/%f %B/xrestore -@unexec rm -f %B/xrestore diff --git a/misc/afbackup/files/pkg-plist.guiserver b/misc/afbackup/files/pkg-plist.guiserver deleted file mode 100644 index b2cc67e76ab3..000000000000 --- a/misc/afbackup/files/pkg-plist.guiserver +++ /dev/null @@ -1,6 +0,0 @@ -sbin/xafserverconfig -@exec ln -sf %B/%f %B/xserverconfig -@unexec rm -f %B/xserverconfig -sbin/xafserverstatus -@exec ln -sf %B/%f %B/xserverstatus -@unexec rm -f %B/xserverstatus diff --git a/misc/afbackup/files/pkg-plist.l10n b/misc/afbackup/files/pkg-plist.l10n deleted file mode 100644 index 30a217b4fc90..000000000000 --- a/misc/afbackup/files/pkg-plist.l10n +++ /dev/null @@ -1,2 +0,0 @@ -share/afbackup/locale/de/LC_MESSAGES/afbackup.mo -share/afbackup/locale/it/LC_MESSAGES/afbackup.mo diff --git a/misc/afbackup/files/pkg-plist.rexeclinks b/misc/afbackup/files/pkg-plist.rexeclinks deleted file mode 100644 index 4cc0a0e66cd9..000000000000 --- a/misc/afbackup/files/pkg-plist.rexeclinks +++ /dev/null @@ -1,12 +0,0 @@ -@exec ln -sf %D/sbin/afrestore %D/libexec/afbackup/afrestore -@exec ln -sf %D/sbin/afverify %D/libexec/afbackup/afverify -@exec ln -sf %D/sbin/copy_tape %D/libexec/afbackup/copy_tape -@exec ln -sf %D/sbin/full_backup %D/libexec/afbackup/full_backup -@exec ln -sf %D/sbin/incr_backup %D/libexec/afbackup/incr_backup -@exec ln -sf %D/sbin/update_indexes %D/libexec/afbackup/update_indexes -@unexec rm -f %D/libexec/afbackup/update_indexes -@unexec rm -f %D/libexec/afbackup/afrestore -@unexec rm -f %D/libexec/afbackup/afverify -@unexec rm -f %D/libexec/afbackup/copy_tape -@unexec rm -f %D/libexec/afbackup/full_backup -@unexec rm -f %D/libexec/afbackup/incr_backup diff --git a/misc/afbackup/files/pkg-plist.server b/misc/afbackup/files/pkg-plist.server deleted file mode 100644 index f8d42936ea2e..000000000000 --- a/misc/afbackup/files/pkg-plist.server +++ /dev/null @@ -1,20 +0,0 @@ -libexec/afbackup/afserver -libexec/afbackup/afmserver -libexec/afbackup/__mt -libexec/afbackup/__inc_link -libexec/afbackup/__numset -libexec/afbackup/cartagehandler -sbin/cartready -@exec ln -sf %B/%f %B/changerready -@unexec rm -f %B/changerready -sbin/label_tape -@exec ln -sf %B/%f %B/cart_ctl -@unexec rm -f %B/cart_ctl -@exec ln -sf %B/%f %B/cartis -@unexec rm -f %B/cartis -sbin/afserverconfig -@exec ln -sf %B/%f %B/serverconfig -@unexec rm -f %B/serverconfig -share/afbackup/lib/aftcllib.tcl -etc/afbackup/server.conf.sample -etc/afbackup/changer.conf.sample diff --git a/misc/afbackup/pkg-descr b/misc/afbackup/pkg-descr deleted file mode 100644 index 73f6f86feff9..000000000000 --- a/misc/afbackup/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This is a client-server backup system offering several -workstations a centralized backup to special backup -servers. - -WWW: http://www.afbackup.org/ - -- Vadim Belman -voland@catpipe.net diff --git a/misc/afbackup/pkg-install b/misc/afbackup/pkg-install deleted file mode 100644 index 6433712452ec..000000000000 --- a/misc/afbackup/pkg-install +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -#set -vx - -PKG_BATCH=${BATCH:=NO} -PKG_PREFIX=${PKG_PREFIX:=/usr/local} - -SERVERVARDIR=/var/spool/afbackup - -# -# create 'afbackup' user before installing -# - -dlg() { - if [ X"${NONINTERACTIVE}" != "XYES" ]; then - dialog "$@" - return $? - else - i=1 - while [ $i -lt $# ]; do - eval 'arg="$'$i'"' - if [ $arg = '--msgbox' ]; then - eval 'echo "$'$(($i+1))'"' - return 0 - fi - i=$(($i+1)) - done - fi - return 0; -} - -create() { - if [ ! -x /usr/sbin/pw ]; then - dlg --msgbox "Please add a user named \`afbackup' before installing this package." 6 60 - exit 69 - fi - - if [ -x /sbin/nologin ]; then - shell=/sbin/nologin - else - shell=/nonexistent - fi - if ! pw show user afbackup -q >/dev/null; then - if ! dlg --clear --yesno "There is no user afbackup on your system.\n\nDo you want it to be created?" 7 60; then - dlg --msgbox "Please add a user named \`afbackup' before installing this package." 6 60 - exit 69 - fi - uid=100 - while pw show user -u ${uid} -q >/dev/null; do - uid=`expr ${uid} + 1` - done - if ! pw add user afbackup -u ${uid} -g operator -d "/nonexistent" \ - -c "AFBackup System Owner" -s "${shell}" \ - ; then - e=$? - dlg --msgbox "Failed to add an account for \`afbackup' user. Please add it manually." 6 60 - exit ${e} - fi - echo "==> Added user \`afbackup' (id ${uid})" - else - if ! pw mod user afbackup -g operator -d "/nonexistent" \ - -c "AFBackup System Owner" -s "${shell}" \ - ; then - e=$? - dlg --msgbox "Failed to update user \`afbackup'." 6 60 - exit ${e} - fi - echo "==> Updated user \`afbackup'." - fi -} - -case $2 in - PRE-INSTALL) - create - ;; - POST-INSTALL) - case $1 in - *-client*) - ;; - *) - if [ ! -d ${SERVERVARDIR} ]; then - install -d -o afbackup -g operator ${SERVERVARDIR} - touch ${SERVERVARDIR}/readonly_tapes - fi - ;; - esac - - ;; -esac diff --git a/misc/afbackup/pkg-message b/misc/afbackup/pkg-message deleted file mode 100644 index 2c9b9b060cbd..000000000000 --- a/misc/afbackup/pkg-message +++ /dev/null @@ -1,27 +0,0 @@ --------------------------------------------------------------- - - *** IMPORTANT! *** - -An autogenerated DES key has been installed for you in -${PREFIX}/etc/afbackup/cryptkey. Remember to change it! - -Also, ${PREFIX}/share/doc/afbackup contains the documentation -you ought to read before starting using the package. - -For server configuration one must add two services into -/etc/services files: - -afbackup 2988/tcp -afmbackup 2989/tcp - -and into /etc/inetd.conf: - -afbackup stream tcp nowait afbackup ${PKG_PREFIX}/libexec/afbackup/afserver ${PKG_PREFIX}/libexec/afbackup/afserver ${PKG_PREFIX}/etc/afbackup/server.conf -afmbackup stream tcp nowait afbackup ${PKG_PREFIX}/libexec/afbackup/afmserver ${PKG_PREFIX}/libexec/afbackup/afmserver ${PKG_PREFIX}/etc/afbackup/server.conf - -For more information on how to configure the package read -${PKG_PREFIX}/share/doc/afbackup/INSTALL keeping in mind that -the package conforms to hier(7); in other words, paths are -different from what is mentioned in the document. - --------------------------------------------------------------- |