forked from pool/schily
Jan Engelhardt
adba8398de
OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=141
223 lines
7.1 KiB
Diff
223 lines
7.1 KiB
Diff
From: Kristyna Streitova <kstreitova@suse.com>
|
|
Date: Wed, 06 Jun 2018 14:51:57 +0000
|
|
X-Upstream: PATCH-FIX-SUSE
|
|
|
|
Some default values for configuration/compilation
|
|
|
|
---
|
|
DEFAULTS/Defaults.linux | 11 +++++------
|
|
include/schily/schily.h | 2 +-
|
|
mt/Makefile | 4 ++--
|
|
rmt/Makefile | 4 ++--
|
|
rmt/Makefile.man | 2 +-
|
|
rmt/rmt.1 | 3 +--
|
|
rmt/rmt.dfl | 16 +++++++---------
|
|
star/all.mk | 2 +-
|
|
star/pax.mk | 2 +-
|
|
star/star.mk | 4 ++--
|
|
10 files changed, 23 insertions(+), 27 deletions(-)
|
|
|
|
Index: schily-2022-10-16/DEFAULTS/Defaults.linux
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/DEFAULTS/Defaults.linux
|
|
+++ schily-2022-10-16/DEFAULTS/Defaults.linux
|
|
@@ -26,7 +26,7 @@ DEFLINKMODE= static
|
|
# If the next line is uncommented, compilation is done with minimal warnings
|
|
#
|
|
###########################################################################
|
|
-CWARNOPTS=
|
|
+#CWARNOPTS=
|
|
|
|
###########################################################################
|
|
#
|
|
@@ -41,9 +41,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 +56,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-2022-10-16/include/schily/schily.h
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/include/schily/schily.h
|
|
+++ schily-2022-10-16/include/schily/schily.h
|
|
@@ -431,7 +431,7 @@ extern int _comerr __PR((FILE *, int, i
|
|
#endif /* EOF */
|
|
|
|
/*PRINTFLIKE1*/
|
|
-extern int error __PR((const char *, ...)) __printflike__(1, 2);
|
|
+extern int error __PR((const char *, ...));
|
|
/*PRINTFLIKE1*/
|
|
extern int gterror __PR((const char *, ...)) __printflike__(1, 2);
|
|
|
|
Index: schily-2022-10-16/mt/Makefile
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/mt/Makefile
|
|
+++ schily-2022-10-16/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
|
|
CPPOPTS += -DUSE_NLS # Include locale support
|
|
@@ -21,7 +21,7 @@ CFILES= mt.c
|
|
# LIB_CAP is needed for Linux capability support in librmt.
|
|
#
|
|
LIBS= -lrmt -lschily $(LIB_SOCKET) $(LIB_CAP) $(LIB_INTL)
|
|
-XMK_FILE= Makefile.man mt.mk1
|
|
+XMK_FILE= Makefile.man
|
|
|
|
###########################################################################
|
|
include $(SRCROOT)/$(RULESDIR)/rules.cmd
|
|
Index: schily-2022-10-16/rmt/Makefile
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/rmt/Makefile
|
|
+++ schily-2022-10-16/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-2022-10-16/rmt/Makefile.man
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/rmt/Makefile.man
|
|
+++ schily-2022-10-16/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-2022-10-16/rmt/rmt.1
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/rmt/rmt.1
|
|
+++ schily-2022-10-16/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-2022-10-16/rmt/rmt.dfl
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/rmt/rmt.dfl
|
|
+++ schily-2022-10-16/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-2022-10-16/star/all.mk
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/star/all.mk
|
|
+++ schily-2022-10-16/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-2022-10-16/star/pax.mk
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/star/pax.mk
|
|
+++ schily-2022-10-16/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-2022-10-16/star/star.mk
|
|
===================================================================
|
|
--- schily-2022-10-16.orig/star/star.mk
|
|
+++ schily-2022-10-16/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
|
|
@@ -39,7 +39,7 @@ HFILES= star.h starsubs.h dirtime.h xta
|
|
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
|
|
+XMK_FILE= Makefile.man
|
|
|
|
###########################################################################
|
|
include $(SRCROOT)/$(RULESDIR)/rules.cmd
|