jengelh/schily
SHA256
1
0
Fork 0
forked from pool/schily
Code Pull Requests Activity
214927d25b
schily/schily-2018-05-25_star_configuration.patch

227 lines
7.5 KiB
Diff
Raw Normal View History

Accepting request 614590 from home:kstreitova:branches:utilities - add patches from the star package * schily-2018-05-25_star_configuration.patch * schily-2018-05-25_star_no_fsync.patch * schily-2018-05-25_star_lock.patch * schily-2018-05-25_star_detect_gzip_failures.patch * schily-2018-05-25_star_bufferoverflow.patch * schily-2018-05-25_star_use_ssh_by_default.patch * schily-2018-05-25_star_selinux.patch - add missing BuildRequires for star: * autoconf (because of selinux patch) * libacl-devel * libattr-devel * libselinux-devel * libtool - install README-FIRST (as schily-rmt) documentation - add noreplace for %_sysconfdir/default/rmt and %_sysconfdir/default/star - move srmt from sbindir to bindir - do not ship star_sym and suntar OBS-URL: https://build.opensuse.org/request/show/614590 OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=27
2018-06-06 16:57:44 +02:00
Index: schily-2018-05-25/DEFAULTS/Defaults.linux
===================================================================
--- schily-2018-05-25.orig/DEFAULTS/Defaults.linux
+++ schily-2018-05-25/DEFAULTS/Defaults.linux
@@ -26,7 +25,7 @@ DEFLINKMODE= static
# If the next line is uncommented, compilation is done with minimal warnings
#
###########################################################################
-CWARNOPTS=
+#CWARNOPTS=
###########################################################################
#
@@ -41,9 +40,8 @@ LINUX_SRC_INCLUDE= $(__LINUX_SRC_IN
DEFINCDIRS= $(SRCROOT)/include
DEFOSINCDIRS=
-LDPATH= -L/opt/schily/lib
-#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
+LDPATH= -L/usr/lib
+RUNPATH=
###########################################################################
#
@@ -57,13 +55,13 @@ OSDEFS += -D_GNU_SOURCE
# Installation config stuff
#
###########################################################################
-INS_BASE= /opt/schily
+INS_BASE= /usr
INS_KBASE= /
INS_RBASE= /
#
DEFUMASK= 002
#
-DEFINSMODEF= 444
+DEFINSMODEF= 644
DEFINSMODEX= 755
DEFINSUSR= root
DEFINSGRP= bin
Index: schily-2018-05-25/include/schily/schily.h
===================================================================
--- schily-2018-05-25.orig/include/schily/schily.h
+++ schily-2018-05-25/include/schily/schily.h
@@ -377,7 +377,7 @@ extern int _comerr __PR((FILE *, int, i
#endif
/*PRINTFLIKE1*/
-extern int error __PR((const char *, ...)) __printflike__(1, 2);
+extern int error __PR((const char *, ...));
#ifdef FOUND_SIZE_T
extern char *fillbytes __PR((void *, ssize_t, char));
extern char *zerobytes __PR((void *, ssize_t));
Index: schily-2018-05-25/mt/Makefile
===================================================================
--- schily-2018-05-25.orig/mt/Makefile
+++ schily-2018-05-25/mt/Makefile
@@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin
TARGET= smt
-SYMLINKS= mt
+#SYMLINKS= mt
CPPOPTS += -DUSE_REMOTE
CPPOPTS += -DSCHILY_PRINT
@@ -17,7 +17,7 @@ CFILES= mt.c
# LIB_CAP is needed for Linux capability support in librmt.
#
LIBS= -lrmt -lschily $(LIB_SOCKET) $(LIB_CAP)
-XMK_FILE= Makefile.man mt.mk1
+XMK_FILE= Makefile.man
###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.cmd
Index: schily-2018-05-25/rmt/rmt.1
===================================================================
--- schily-2018-05-25.orig/rmt/rmt.1
+++ schily-2018-05-25/rmt/rmt.1
@@ -17,9 +17,8 @@
.SH NAME
rmt \- remote magnetic tape protocol server
.SH SYNOPSIS
-.B /opt/schily/sbin/rmt
.br
-.B /etc/rmt
+.B /usr/bin/rmt
.SH DESCRIPTION
.IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server"
Index: schily-2018-05-25/rmt/rmt.dfl
===================================================================
--- schily-2018-05-25.orig/rmt/rmt.dfl
+++ schily-2018-05-25/rmt/rmt.dfl
@@ -18,15 +18,13 @@
# Each USER= entry adds the listed user to the users who may run rmt
#
# A typical passwd entry looks like this:
-# rtape:x:1999:1000:Remote TAPE:/export/home/rtape:/opt/schily/sbin/rmt
+# rtape:x:1999:1000:Remote TAPE:/home/tape:/usr/sbin/rmt
#
-# Add entries for all valid remote users to /export/home/rtape/.rhosts
+# Add entries for all valid remote users to:
+# /home/tape/.rhosts
#
#USER=rtape
-#USER=joerg
-# Default to old SunOS behavior. If you like to be more restrictive, comment
-# out the entry below and enable the explicit USER= entries above.
-USER=*
+#USER=*
#
# Each ACCESS= entry adds a target or group of targets to the list of visible
@@ -43,8 +41,8 @@ USER=*
# user host file
# name name
#
-#ACCESS=rtape sparky /dev/rmt/*
-ACCESS=* * /dev/rmt/*
+#ACCESS=rtape sparky /dev/st0
+#ACCESS=* * /dev/nst*
ACCESS=* * /dev/null
-ACCESS=* * /dev/zero
+#ACCESS=* * /dev/zero
#ACCESS=* * *
Index: schily-2018-05-25/rmt/Makefile
===================================================================
--- schily-2018-05-25.orig/rmt/Makefile
+++ schily-2018-05-25/rmt/Makefile
@@ -5,8 +5,8 @@ RULESDIR= RULES
include $(SRCROOT)/$(RULESDIR)/rules.top
###########################################################################
-INSDIR= sbin
-TARGET= rmt
+INSDIR= bin
+TARGET= srmt
CPPOPTS += -DUSE_REMOTE
CPPOPTS += -DUSE_LARGEFILES
CFILES= rmt.c
Index: schily-2018-05-25/rmt/Makefile.man
===================================================================
--- schily-2018-05-25.orig/rmt/Makefile.man
+++ schily-2018-05-25/rmt/Makefile.man
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
###########################################################################
MANDIR= man
-TARGETMAN= rmt
+TARGETMAN= srmt
MANSECT= $(MANSECT_CMD)
MANSUFFIX= $(MANSUFF_CMD)
MANFILE= rmt.1
Index: schily-2018-05-25/star/all.mk
===================================================================
--- schily-2018-05-25.orig/star/all.mk
+++ schily-2018-05-25/star/all.mk
@@ -12,7 +12,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
# and copy star_fat.mk to Makefile.
#
-MK_FILES= star.mk pax.mk suntar.mk gnutar.mk cpio.mk
+MK_FILES=star.mk pax.mk Makefile.dfl
###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.mks
Index: schily-2018-05-25/star/pax.mk
===================================================================
--- schily-2018-05-25.orig/star/pax.mk
+++ schily-2018-05-25/star/pax.mk
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin
TARGET= spax
-#SYMLINKS= ustar tar
+SYMLINKS= pax
CPPOPTS += -D__STAR__
CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
#CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP
Index: schily-2018-05-25/star/star.mk
===================================================================
--- schily-2018-05-25.orig/star/star.mk
+++ schily-2018-05-25/star/star.mk
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin
TARGET= star
-SYMLINKS= ustar tar
+SYMLINKS= ustar
CPPOPTS += -D__STAR__
CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
#CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP
@@ -23,6 +23,7 @@ CPPOPTS += -DCOPY_LINKS_DELAYED
CPPOPTS += -DUSE_NLS
CPPOPTS += -DTEXT_DOMAIN=\"SCHILY_utils\"
CPPOPTS += -DSCHILY_PRINT
+CPPOPTS += -DWITH_SELINUX
CFILES= star.c header.c cpiohdr.c xheader.c xattr.c \
list.c extract.c create.c append.c diff.c restore.c \
remove.c star_unix.c acl_unix.c acltext.c fflags.c \
@@ -37,8 +38,8 @@ CFILES= star.c header.c cpiohdr.c xhead
HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \
movearch.h table.h props.h fifo.h diff.h restore.h \
checkerr.h dumpdate.h bitstring.h
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
-XMK_FILE= Makefile.man starformatman.mk
+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
+XMK_FILE= Makefile.man
###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.cmd
Index: schily-2018-05-25/man/Makefile
===================================================================
--- schily-2018-05-25.orig/man/Makefile
+++ schily-2018-05-25/man/Makefile
@@ -7,7 +7,7 @@ RULESDIR= RULES
include $(SRCROOT)/$(RULESDIR)/rules.top
###########################################################################
-DIRS= man4
+DIRS= man1
###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.dir
Copy Permalink