File amanda-2.6.0-no_chown_am.patch of Package amanda
--- amandad-src/Makefile.am
+++ amandad-src/Makefile.am
@@ -36,11 +36,11 @@
../gnulib/libgnu.$(LIB_EXTENSION)
INSTALLPERMS_exec = \
- dest=$(amlibexecdir) chown=amanda \
+ dest=$(amlibexecdir) \
$(amlibexec_PROGRAMS)
INSTALLPERMS_data = \
- dest=$(amlibexecdir) chown=amanda \
+ dest=$(amlibexecdir) \
$(amlibexec_SCRIPTS)
lint:
--- amplot/Makefile.am
+++ amplot/Makefile.am
@@ -24,5 +24,5 @@
mv amplot.gp.new amplot.gp
INSTALLPERMS_data = \
- dest=$(amplotdir) chown=amanda $(amplot_DATA) \
- dest=$(sbindir) chown=amanda $(sbin_SCRIPTS)
+ dest=$(amplotdir) $(amplot_DATA) \
+ dest=$(sbindir) $(sbin_SCRIPTS)
--- changer-src/Makefile.am
+++ changer-src/Makefile.am
@@ -99,12 +99,10 @@
EXTRA_DIST += scsi-proto.c
INSTALLPERMS_exec = \
- chown=amanda \
dest=$(sbindir) $(sbin_PROGRAMS) \
dest=$(amlibexecdir) $(amlibexec_PROGRAMS)
INSTALLPERMS_data = \
- chown=amanda \
dest=$(sbindir) $(sbin_SCRIPTS) \
dest=$(amlibexecdir) $(amlibexec_SCRIPTS)
--- client-src/Makefile.am
+++ client-src/Makefile.am
@@ -64,15 +64,13 @@
noinst_HEADERS = amandates.h getfsent.h \
findpass.h client_util.h
-INSTALLPERMS_exec = chown=amanda \
- dest=$(amlibexecdir) $(amlibexec_PROGRAMS)
+INSTALLPERMS_exec = dest=$(amlibexecdir) $(amlibexec_PROGRAMS)
-INSTALLPERMS_data = chown=amanda \
- dest=$(sbindir) $(sbin_SCRIPTS) \
+INSTALLPERMS_data = dest=$(sbindir) $(sbin_SCRIPTS) \
dest=$(amlibexecdir) $(amlibexec_SCRIPTS)
if WANT_SETUID_CLIENT
-INSTALLPERMS_exec += dest=$(amlibexecdir) chown=root chmod=u+s,o-rwx \
+INSTALLPERMS_exec += dest=$(amlibexecdir) chmod=u+s,o-rwx \
calcsize killpgrp rundump runtar
endif
--- common-src/Makefile.am
+++ common-src/Makefile.am
@@ -225,7 +225,7 @@
# installation
-INSTALLPERMS_data = dest=$(sbindir) chown=amanda $(sbin_SCRIPTS)
+INSTALLPERMS_data = dest=$(sbindir) $(sbin_SCRIPTS)
lint:
@echo $(LINT) $(libamanda_la_SOURCES)
--- dumper-src/Makefile.am
+++ dumper-src/Makefile.am
@@ -19,4 +19,4 @@
dumperdir = $(DUMPER_DIR)
dumper_SCRIPTS = $(SCRIPTS_PERL)
-INSTALLPERMS_data = dest=$(dumperdir) chown=amanda $(dumper_SCRIPTS)
+INSTALLPERMS_data = dest=$(dumperdir) $(dumper_SCRIPTS)
--- example/Makefile.am
+++ example/Makefile.am
@@ -37,7 +37,6 @@
DLT-A4.ps \
DIN-A4.ps
-INSTALLPERMS_data = chown=amanda \
- dest=$(templatedir) $(dist_template_DATA) \
+INSTALLPERMS_data = dest=$(templatedir) $(dist_template_DATA) \
dest=$(exampledir) $(dist_example_DATA) \
dest=$(libtempldir) $(dist_libtempl_DATA)
--- oldrecover-src/Makefile.am
+++ oldrecover-src/Makefile.am
@@ -55,7 +55,7 @@
INSTALLPERMS_exec = \
- dest=$(sbindir) chown=amanda chmod=o-rwx $(sbin_PROGRAMS)
+ dest=$(sbindir) chmod=o-rwx $(sbin_PROGRAMS)
lint:
@ f="$(amoldrecover_CSRC)"; \
--- recover-src/Makefile.am
+++ recover-src/Makefile.am
@@ -54,7 +54,7 @@
$(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -c $<
INSTALLPERMS_exec = \
- dest=$(sbindir) chown=amanda chmod=o-rwx $(sbin_PROGRAMS)
+ dest=$(sbindir) chmod=o-rwx $(sbin_PROGRAMS)
lint:
@f="$(amrecover_CSRC)"; \
--- restore-src/Makefile.am
+++ restore-src/Makefile.am
@@ -52,8 +52,8 @@
noinst_HEADERS = restore.h
INSTALLPERMS_exec = \
- dest=$(sbindir) chown=amanda $(sbin_PROGRAMS) \
- dest=$(amlibexecdir) chown=amanda $(amlibexec_PROGRAMS)
+ dest=$(sbindir) $(sbin_PROGRAMS) \
+ dest=$(amlibexecdir) $(amlibexec_PROGRAMS)
lint:
@ for p in $(amlibexec_PROGRAMS) $(sbin_PROGRAMS); do \
--- server-src/Makefile.am
+++ server-src/Makefile.am
@@ -54,19 +54,19 @@
sbin_SCRIPTS = $(SCRIPTS_PERL) $(SCRIPTS_SHELL)
INSTALLPERMS_exec = \
- dest=$(sbindir) chown=amanda chmod= \
+ dest=$(sbindir) chmod= \
$(sbin_PROGRAMS) \
- chown=root chmod=u+s,o-rwx \
+ chmod=u+s,o-rwx \
amcheck \
- dest=$(amlibexecdir) chown=amanda chmod= \
+ dest=$(amlibexecdir) chmod= \
$(amlibexec_PROGRAMS) \
- chown=root chmod=u+s,o-rwx \
+ chmod=u+s,o-rwx \
dumper planner
INSTALLPERMS_data = \
- dest=$(sbindir) chown=amanda chmod= \
+ dest=$(sbindir) chmod= \
$(sbin_SCRIPTS) \
- dest=$(amlibexecdir) chown=amanda chmod= \
+ dest=$(amlibexecdir) chmod= \
$(amlibexec_SCRIPTS)
###
--- tape-src/Makefile.am
+++ tape-src/Makefile.am
@@ -6,7 +6,7 @@
-I$(top_srcdir)/common-src \
-I$(top_srcdir)/gnulib
-AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) -fPIE
+AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) -fPIE -fPIC
AM_LDFLAGS = -pie $(AMANDA_STATIC_LDFLAGS)
LINT=@AMLINT@
@@ -23,7 +23,7 @@
output-tape.c \
tapeio.c
-libamtape_la_LDFLAGS = -release $(VERSION)
+libamtape_la_LDFLAGS = -pie -release $(VERSION)
###
# Because libamanda includes routines (e.g. regex) provided by some system
@@ -54,8 +54,8 @@
tapeio.h
INSTALLPERMS_exec = \
- dest=$(sbindir) chown=amanda $(sbin_PROGRAMS) $(sbin_SCRIPTS) \
- dest=$(amlibexecdir) chown=amanda $(amlibexec_PROGRAMS) $(amlibexec_SCRIPTS)
+ dest=$(sbindir) $(sbin_PROGRAMS) $(sbin_SCRIPTS) \
+ dest=$(amlibexecdir) $(amlibexec_PROGRAMS) $(amlibexec_SCRIPTS)
amtapeio_SOURCES = amtapeio.test.c
amtapeio_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \