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

General beef-up. Depend on gtar, fix paths, move config back to /etc etc.

Browse Source
This commit is contained in:
niklas 1998-01-16 11:29:25 +00:00
parent fb075a7557
commit f24de36ebf
11 changed files with 214 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/amanda/Makefile
View File

@ -3,7 +3,7 @@
# Date created: 9 Dec 1997
# Whom: ejovi
#
# $OpenBSD: Makefile,v 1.1.1.1 1997/12/09 06:23:36 joey Exp $
# $OpenBSD: Makefile,v 1.2 1998/01/16 11:29:25 niklas Exp $
#
DISTNAME= amanda-2.3.0
@ -12,6 +12,8 @@ MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
MAINTAINER= joey@OpenBSD.ORG
BUILD_DEPENDS= ${PREFIX}/bin/gtar:${PORTSDIR}/archivers/gtar
PATCH_STRIP=
MAN8= amanda.8 amadmin.8 amcheck.8 amcleanup.8 amdump.8 \
amflush.8 amlabel.8 amrestore.8 amtape.8

32
misc/amanda/patches/patch-aa
View File

@ -1,19 +1,13 @@
*** tools/munge.orig Tue Feb 28 23:43:46 1995
--- tools/munge Tue Feb 28 23:44:12 1995
***************
*** 35,41 ****
# Customize CPP to point to your system's C preprocessor.
# if cpp is on your path:
! CPP=cpp
# if cpp is not on your path, try one of these:
# CPP=/lib/cpp # traditional
--- 35,41 ----
# Customize CPP to point to your system's C preprocessor.
# if cpp is on your path:
! CPP=/usr/bin/cpp
# if cpp is not on your path, try one of these:
# CPP=/lib/cpp # traditional
--- ./common-src/conffile.c.orig Mon May 20 04:11:24 1996
+++ ./common-src/conffile.c Thu Jan 8 13:46:13 1998
@@ -213,8 +213,8 @@
init_string(&conf_tpchanger.s, "");
init_string(&conf_labelstr.s, ".*");
init_string(&conf_tapelist.s, "tapelist");
- init_string(&conf_infofile.s, "/usr/adm/amanda/curinfo");
- init_string(&conf_logfile.s, "/usr/adm/amanda/log");
+ init_string(&conf_infofile.s, "/var/db/amanda/curinfo");
+ init_string(&conf_logfile.s, "/var/log/amanda/log");
init_string(&conf_diskfile.s, "disklist");
init_string(&conf_diskdir.s, "/dumps/amanda");
init_string(&tapetype_id.s, "EXABYTE");

131
misc/amanda/patches/patch-ab
View File

@ -1,76 +1,67 @@
--- man/amanda.8~ Sun May 19 22:11:25 1996
+++ man/amanda.8 Fri Mar 7 22:24:28 1997
@@ -135,19 +135,19 @@
--- config/options.h-vanilla.orig Mon May 20 04:11:25 1996
+++ config/options.h-vanilla Wed Jan 14 10:47:33 1998
@@ -45,7 +45,7 @@
#define CONFIG_DIR "/etc/amanda"
#define LIBEXEC_DIR "/usr/local/libexec/amanda"
#define BIN_DIR "/usr/local/sbin"
-#define MAN_DIR "/usr/share/local/man/man8"
+#define MAN_DIR "/usr/local/man/man8"
All the files are stored in a
.I config
-directory under /etc/amanda. Often a single site will have more than
+directory under /usr/local/etc/amanda. Often a single site will have more than
one configuration; these configurations are named by the directories
that their config files are in. For example, a site might have a
.I normal
configuration for every-day backups, and a
.I archive
configuration for 6-month full archival backups. The config files for
-these two would be stored under /etc/amanda/normal and
-/etc/amanda/archive, respectively.
+these two would be stored under /usr/local/etc/amanda/normal and
+/usr/local/etc/amanda/archive, respectively.
All log and database files generated by Amanda go in corresponding
-directories under /usr/adm/amanda. In our example, the logs would go
-in /usr/adm/amanda/normal and /usr/adm/amanda/archive.
+directories under /var/lov/amanda. In our example, the logs would go
+in /var/log/amanda/normal and /var/log/amanda/archive.
/*
@@ -62,6 +62,9 @@
/* #undef MK_CC */
/* #define MK_CC gcc -Wall */
.SH CONFIG FILE PARAMETERS
+/* We want to install files as root for security reasons */
+#undef MK_INSTFLAGS
+#define MK_INSTFLAGS -c -o root
--- man/amcleanup.8~ Sun May 19 22:11:25 1996
+++ man/amcleanup.8 Fri Mar 7 22:23:07 1997
@@ -31,13 +31,13 @@
/*
* With USE_VERSION_SUFFIXES defined, all the Amanda binaries will be
@@ -77,7 +80,7 @@
* Since 2.2.1 is a major change, I recommend defining this for existing
* Amanda sites.
*/
-#define USE_VERSION_SUFFIXES
+/*#define USE_VERSION_SUFFIXES*/
.PP
.nf
-if [ -s /usr/adm/amanda/csd/amanda.log ]
+if [ -s /var/log/amanda/csd/amanda.log ]
then
/usr/local/sbin/amcleanup csd
fi
.fi
.RS .5i
-Putting the above in /etc/rc.local runs the Amanda
+Putting the above in /usr/local/etc/rc.local runs the Amanda
cleanup process when needed as part of the reboot, eliminating the need
to run it by hand.
.RE
--- man/amflush.8~ Sun May 19 22:11:25 1996
+++ man/amflush.8 Fri Mar 7 22:22:28 1997
@@ -22,7 +22,7 @@
.B Amflush
will look in the holding disk specified by the
.I amanda.conf
-file in /etc/amanda/\fIconfig\fR
+file in /usr/local/etc/amanda/\fIconfig\fR
for any non-empty Amanda work directories. It then prompts the
operator to select the correct directory. The work directories on the
holding disk are named by the date at the time
--- man/amlabel.8~ Sun May 19 22:11:25 1996
+++ man/amlabel.8 Fri Mar 7 22:22:22 1997
@@ -11,7 +11,7 @@
.B Amlabel
writes an Amanda label on the tape in the tape drive specified by the
.I amanda.conf
-file in /etc/amanda/\fIconfig\fR. The
+file in /usr/local/etc/amanda/\fIconfig\fR. The
.I label
can be any string that does not contain whitespace, and that matches the
.I amanda.conf
@@ -26,7 +26,7 @@
.TP
% amlabel csd VOL1
If the line "tapedev /dev/tape/1n" is in
-/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
+/usr/local/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
written on the /dev/tape/1n device.
.SH AUTHOR
/*
@@ -151,7 +154,7 @@
* on /etc/dumpdates.
*/
-#define FORCE_USERID
+#undef FORCE_USERID
#ifdef FORCE_USERID
# define CLIENT_LOGIN "bin"
@@ -182,17 +185,17 @@
#define HAVE_GZIP
#ifdef HAVE_GZIP
-# define COMPRESS_PATH "/usr/imports/bin/gzip"
+# define COMPRESS_PATH "/usr/bin/gzip"
# define COMPRESS_SUFFIX ".gz"
# define COMPRESS_FAST_OPT "--fast"
# define COMPRESS_BEST_OPT "--best"
-# define UNCOMPRESS_CMD "gzcat"
+# define UNCOMPRESS_CMD "/usr/bin/gzcat"
#else
# define COMPRESS_PATH COMPRESS /* defined in config.h */
# define COMPRESS_SUFFIX ".Z"
# define COMPRESS_FAST_OPT "-f" /* -f doesn't do anything */
# define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
-# define UNCOMPRESS_CMD "zcat"
+# define UNCOMPRESS_CMD "/usr/bin/zcat"
#endif
/*
@@ -206,5 +209,5 @@
* you must install it and specify its path here.
*/
#ifndef GNUTAR
-#define GNUTAR "/usr/imports/bin/gtar"
+#define GNUTAR "/usr/local/bin/gtar"
#endif

104
misc/amanda/patches/patch-ac
View File

@ -1,75 +1,29 @@
*** config/options.h-vanilla Fri Feb 10 11:21:59 1995
--- config/options.h Tue Feb 28 16:34:30 1995
***************
*** 42,51 ****
* LIBEXEC_DIR - Internal support programs
* MAN_DIR - Man pages
*/
! #define CONFIG_DIR "/etc/amanda"
#define LIBEXEC_DIR "/usr/local/libexec/amanda"
#define BIN_DIR "/usr/local/sbin"
! #define MAN_DIR "/usr/share/local/man/man8"
/*
--- 42,51 ----
* LIBEXEC_DIR - Internal support programs
* MAN_DIR - Man pages
*/
! #define CONFIG_DIR "/usr/local/etc/amanda"
#define LIBEXEC_DIR "/usr/local/libexec/amanda"
#define BIN_DIR "/usr/local/sbin"
! #define MAN_DIR "/usr/local/man/man8"
/*
***************
*** 77,83 ****
* Since 2.2.1 is a major change, I recommend defining this for existing
* Amanda sites.
*/
! #define USE_VERSION_SUFFIXES
/*
--- 77,83 ----
* Since 2.2.1 is a major change, I recommend defining this for existing
* Amanda sites.
*/
! /*#define USE_VERSION_SUFFIXES*/
/*
***************
*** 182,196 ****
#define HAVE_GZIP
#ifdef HAVE_GZIP
! # define COMPRESS_PATH "/usr/imports/bin/gzip"
# define COMPRESS_SUFFIX ".gz"
# define COMPRESS_FAST_OPT "--fast"
# define COMPRESS_BEST_OPT "--best"
! # define UNCOMPRESS_CMD "gzcat"
#else
# define COMPRESS_PATH COMPRESS /* defined in config.h */
# define COMPRESS_SUFFIX ".Z"
# define COMPRESS_FAST_OPT "-f" /* -f doesn't do anything */
# define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
! # define UNCOMPRESS_CMD "zcat"
#endif
--- 182,196 ----
#define HAVE_GZIP
#ifdef HAVE_GZIP
! # define COMPRESS_PATH "/usr/bin/gzip"
# define COMPRESS_SUFFIX ".gz"
# define COMPRESS_FAST_OPT "--fast"
# define COMPRESS_BEST_OPT "--best"
! # define UNCOMPRESS_CMD "/usr/bin/gzcat"
#else
# define COMPRESS_PATH COMPRESS /* defined in config.h */
# define COMPRESS_SUFFIX ".Z"
# define COMPRESS_FAST_OPT "-f" /* -f doesn't do anything */
# define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
! # define UNCOMPRESS_CMD "/usr/bin/zcat"
#endif
--- ./man/amanda.8.orig Mon May 20 04:11:25 1996
+++ ./man/amanda.8 Thu Jan 8 13:46:13 1998
@@ -146,8 +146,8 @@
/etc/amanda/archive, respectively.
All log and database files generated by Amanda go in corresponding
-directories under /usr/adm/amanda. In our example, the logs would go
-in /usr/adm/amanda/normal and /usr/adm/amanda/archive.
+directories under /var/log/amanda. In our example, the logs would go
+in /var/log/amanda/normal and /var/log/amanda/archive.
.SH CONFIG FILE PARAMETERS
@@ -312,13 +312,13 @@
.TP
.B infofile
Default:
-.I /usr/adm/amanda/curinfo.
+.I /var/db/amanda/curinfo.
The file name for the historical information database file.
.TP
.B logfile
Default:
-.I /usr/adm/amanda/log
+.I /var/log/amanda/log
The file name for the nightly log file.
.TP

11
misc/amanda/patches/patch-ad Normal file
View File

@ -0,0 +1,11 @@
--- ./man/amcleanup.8.orig Mon May 20 04:11:25 1996
+++ ./man/amcleanup.8 Thu Jan 8 13:46:13 1998
@@ -31,7 +31,7 @@
.PP
.nf
-if [ -s /usr/adm/amanda/csd/amanda.log ]
+if [ -s /var/log/amanda/log ]
then
/usr/local/sbin/amcleanup csd
fi

11
misc/amanda/patches/patch-ae Normal file
View File

@ -0,0 +1,11 @@
--- ./tools/munge.orig Mon May 20 04:11:25 1996
+++ ./tools/munge Thu Jan 8 13:46:13 1998
@@ -35,7 +35,7 @@
# Customize CPP to point to your system's C preprocessor.
# if cpp is on your path:
-CPP=cpp
+CPP=/usr/bin/cpp
# if cpp is not on your path, try one of these:
# CPP=/lib/cpp # traditional

11
misc/amanda/patches/patch-af Normal file
View File

@ -0,0 +1,11 @@
--- ./client-src/sendbackup-dump.c.orig Thu Jan 8 15:30:41 1998
+++ ./client-src/sendbackup-dump.c Thu Jan 8 15:31:44 1998
@@ -42,6 +42,8 @@
/* the various encodings of dump size */
{ DMP_SIZE,
"DUMP: DUMP: [0-9][0-9]* tape blocks", 1024},
+ { DMP_SIZE,
+ "DUMP: [0-9][0-9]* tape blocks", 1024},
{ DMP_SIZE,
"dump: Actual: [0-9][0-9]* tape blocks",
1024},

14
misc/amanda/patches/patch-ag Normal file
View File

@ -0,0 +1,14 @@
--- ./client-src/Makefile.in.orig Mon May 20 04:11:24 1996
+++ ./client-src/Makefile.in Fri Jan 9 11:59:41 1998
@@ -120,9 +120,9 @@
install-client-perms:
@echo "Setting permissions for setuid-root client programs:"
@for f in $(SUIDCLIENT); do \
- echo " (cd $(EXECDIR); chown root $$f; chmod u+s $$f)"; \
+ echo " (cd $(EXECDIR); /usr/sbin/chown root $$f; chmod u+s $$f)"; \
(cd $(EXECDIR); \
- chown root $$f || \
+ /usr/sbin/chown root $$f || \
(echo '***' You must be root to set Amanda permissions properly.;\
echo '***' Su to root then "\"$(MAKE) install-perms\"."; exit 0); \
chmod u+s $$f); \

26
misc/amanda/patches/patch-ah Normal file
View File

@ -0,0 +1,26 @@
--- ./server-src/Makefile.in.orig Mon May 20 04:11:25 1996
+++ ./server-src/Makefile.in Fri Jan 9 12:00:35 1998
@@ -151,9 +151,9 @@
install-libexec-perms:
@echo "Setting permissions for setuid-root libexec programs:"
@for f in $(SUIDEXEC); do \
- echo " (cd $(EXECDIR); chown root $$f; chmod u+s $$f)"; \
+ echo " (cd $(EXECDIR); /usr/sbin/chown root $$f; chmod u+s $$f)"; \
(cd $(EXECDIR); \
- chown root $$f || \
+ /usr/sbin/chown root $$f || \
(echo '***' You must be root to set Amanda permissions properly.;\
echo '***' Su to root then "\"$(MAKE) install-perms\"."; exit 0); \
chmod u+s $$f); \
@@ -162,9 +162,9 @@
install-usr-perms:
@echo "Setting permissions for setuid-root user programs:"
@for f in $(SUIDUSR); do \
- echo " (cd $(BINDIR); chown root $$f; chmod u+s $$f)"; \
+ echo " (cd $(BINDIR); /usr/sbin/chown root $$f; chmod u+s $$f)"; \
(cd $(BINDIR); \
- chown root $$f || \
+ /usr/sbin/chown root $$f || \
(echo '***' You must be root to set Amanda permissions properly.;\
echo '***' Su to root then "\"$(MAKE) install-perms\"."; exit 0); \
chmod u+s $$f); \

12
misc/amanda/patches/patch-ai Normal file
View File

@ -0,0 +1,12 @@
--- client-src/sendbackup-gnutar.c.orig Wed Jan 14 10:50:27 1998
+++ client-src/sendbackup-gnutar.c Wed Jan 14 10:50:32 1998
@@ -130,8 +130,7 @@
"gtar", "--create",
"--directory", dirname, "--newer", dumptimestr,
"--incremental","--sparse","--one-file-system",
- "--atime-preserve","--totals",
- "--file", "-", ".",
+ "--totals","--file", "-", ".",
(char *) 0);
/* close the write ends of the pipes */

40
misc/amanda/pkg/PLIST
View File

@ -1,25 +1,18 @@
@pkgdep tar-1.12
libexec/amanda/amandad
libexec/amanda/sendsize
libexec/amanda/calcsize
libexec/amanda/sendbackup-dump
libexec/amanda/sendbackup-gnutar
libexec/amanda/runtar
libexec/amanda/selfcheck
libexec/amanda/taper
libexec/amanda/dumper
libexec/amanda/chg-generic
libexec/amanda/driver
libexec/amanda/dumper
libexec/amanda/getconf
libexec/amanda/planner
libexec/amanda/reporter
libexec/amanda/getconf
sbin/amrestore
sbin/amadmin
sbin/amflush
sbin/amlabel
sbin/amcheck
sbin/amdump
sbin/amcleanup
sbin/amtape
libexec/amanda/chg-generic
libexec/amanda/runtar
libexec/amanda/selfcheck
libexec/amanda/sendbackup-dump
libexec/amanda/sendbackup-gnutar
libexec/amanda/sendsize
libexec/amanda/taper
man/man8/amanda.8
man/man8/amadmin.8
man/man8/amcheck.8
@ -29,3 +22,16 @@ man/man8/amflush.8
man/man8/amlabel.8
man/man8/amrestore.8
man/man8/amtape.8
sbin/amadmin
sbin/amcheck
sbin/amcleanup
sbin/amdump
sbin/amflush
sbin/amlabel
sbin/amrestore
sbin/amtape
share/examples/amanda/amanda.conf
share/examples/amanda/chg-generic.conf
share/examples/amanda/disklist
@dirrm share/examples/amanda
@dirrm libexec/amanda