rpm/schily
SHA256
1
0
Fork 0
forked from pool/schily
Code Pull Requests Activity

- Trim SELINUX from schily-2018-05-25_star_configuration.patch,

Browse Source 
it is already determined by %configure now.

OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=42
This commit is contained in:
Jan Engelhardt 2018-11-08 09:34:22 +00:00 committed by Git OBS Bridge
parent 5528d2b119
commit fdd8296e4b
2 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
schily-2018-05-25_star_configuration.patch
View File

@ -15,13 +15,13 @@ Some default values for configuration/compilation
rmt/rmt.dfl | 16 +++++++--------- rmt/rmt.dfl | 16 +++++++---------
star/all.mk | 2 +- star/all.mk | 2 +-
star/pax.mk | 2 +- star/pax.mk | 2 +-
star/star.mk | 7 ++++--- star/star.mk | 4 ++--
11 files changed, 26 insertions(+), 29 deletions(-) 11 files changed, 24 insertions(+), 28 deletions(-)
Index: schily-2018-08-24/DEFAULTS/Defaults.linux Index: schily-2018-10-30/DEFAULTS/Defaults.linux
=================================================================== ===================================================================
--- schily-2018-08-24.orig/DEFAULTS/Defaults.linux --- schily-2018-10-30.orig/DEFAULTS/Defaults.linux
+++ schily-2018-08-24/DEFAULTS/Defaults.linux +++ schily-2018-10-30/DEFAULTS/Defaults.linux
@@ -26,7 +26,7 @@ DEFLINKMODE= static @@ -26,7 +26,7 @@ DEFLINKMODE= static
# If the next line is uncommented, compilation is done with minimal warnings # If the next line is uncommented, compilation is done with minimal warnings
# #
@ -59,10 +59,10 @@ Index: schily-2018-08-24/DEFAULTS/Defaults.linux
DEFINSMODEX= 755 DEFINSMODEX= 755
DEFINSUSR= root DEFINSUSR= root
DEFINSGRP= bin DEFINSGRP= bin
Index: schily-2018-08-24/include/schily/schily.h Index: schily-2018-10-30/include/schily/schily.h
=================================================================== ===================================================================
--- schily-2018-08-24.orig/include/schily/schily.h --- schily-2018-10-30.orig/include/schily/schily.h
+++ schily-2018-08-24/include/schily/schily.h +++ schily-2018-10-30/include/schily/schily.h
@@ -431,7 +431,7 @@ extern int _comerr __PR((FILE *, int, i @@ -431,7 +431,7 @@ extern int _comerr __PR((FILE *, int, i
#endif /* EOF */ #endif /* EOF */
@ -72,10 +72,10 @@ Index: schily-2018-08-24/include/schily/schily.h
/*PRINTFLIKE1*/ /*PRINTFLIKE1*/
extern int gterror __PR((const char *, ...)) __printflike__(1, 2); extern int gterror __PR((const char *, ...)) __printflike__(1, 2);
Index: schily-2018-08-24/man/Makefile Index: schily-2018-10-30/man/Makefile
=================================================================== ===================================================================
--- schily-2018-08-24.orig/man/Makefile --- schily-2018-10-30.orig/man/Makefile
+++ schily-2018-08-24/man/Makefile +++ schily-2018-10-30/man/Makefile
@@ -7,7 +7,7 @@ RULESDIR= RULES @@ -7,7 +7,7 @@ RULESDIR= RULES
include $(SRCROOT)/$(RULESDIR)/rules.top include $(SRCROOT)/$(RULESDIR)/rules.top
########################################################################### ###########################################################################
@ -85,10 +85,10 @@ Index: schily-2018-08-24/man/Makefile
########################################################################### ###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.dir include $(SRCROOT)/$(RULESDIR)/rules.dir
Index: schily-2018-08-24/mt/Makefile Index: schily-2018-10-30/mt/Makefile
=================================================================== ===================================================================
--- schily-2018-08-24.orig/mt/Makefile --- schily-2018-10-30.orig/mt/Makefile
+++ schily-2018-08-24/mt/Makefile +++ schily-2018-10-30/mt/Makefile
@@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to @@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin INSDIR= bin
@ -107,10 +107,10 @@ Index: schily-2018-08-24/mt/Makefile
########################################################################### ###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.cmd include $(SRCROOT)/$(RULESDIR)/rules.cmd
Index: schily-2018-08-24/rmt/Makefile Index: schily-2018-10-30/rmt/Makefile
=================================================================== ===================================================================
--- schily-2018-08-24.orig/rmt/Makefile --- schily-2018-10-30.orig/rmt/Makefile
+++ schily-2018-08-24/rmt/Makefile +++ schily-2018-10-30/rmt/Makefile
@@ -5,8 +5,8 @@ RULESDIR= RULES @@ -5,8 +5,8 @@ RULESDIR= RULES
include $(SRCROOT)/$(RULESDIR)/rules.top include $(SRCROOT)/$(RULESDIR)/rules.top
########################################################################### ###########################################################################
@ -122,10 +122,10 @@ Index: schily-2018-08-24/rmt/Makefile
CPPOPTS += -DUSE_REMOTE CPPOPTS += -DUSE_REMOTE
CPPOPTS += -DUSE_LARGEFILES CPPOPTS += -DUSE_LARGEFILES
CFILES= rmt.c CFILES= rmt.c
Index: schily-2018-08-24/rmt/Makefile.man Index: schily-2018-10-30/rmt/Makefile.man
=================================================================== ===================================================================
--- schily-2018-08-24.orig/rmt/Makefile.man --- schily-2018-10-30.orig/rmt/Makefile.man
+++ schily-2018-08-24/rmt/Makefile.man +++ schily-2018-10-30/rmt/Makefile.man
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
########################################################################### ###########################################################################
@ -135,10 +135,10 @@ Index: schily-2018-08-24/rmt/Makefile.man
MANSECT= $(MANSECT_CMD) MANSECT= $(MANSECT_CMD)
MANSUFFIX= $(MANSUFF_CMD) MANSUFFIX= $(MANSUFF_CMD)
MANFILE= rmt.1 MANFILE= rmt.1
Index: schily-2018-08-24/rmt/rmt.1 Index: schily-2018-10-30/rmt/rmt.1
=================================================================== ===================================================================
--- schily-2018-08-24.orig/rmt/rmt.1 --- schily-2018-10-30.orig/rmt/rmt.1
+++ schily-2018-08-24/rmt/rmt.1 +++ schily-2018-10-30/rmt/rmt.1
@@ -17,9 +17,8 @@ @@ -17,9 +17,8 @@
.SH NAME .SH NAME
rmt \- remote magnetic tape protocol server rmt \- remote magnetic tape protocol server
@ -150,10 +150,10 @@ Index: schily-2018-08-24/rmt/rmt.1
.SH DESCRIPTION .SH DESCRIPTION
.IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server" .IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server"
Index: schily-2018-08-24/rmt/rmt.dfl Index: schily-2018-10-30/rmt/rmt.dfl
=================================================================== ===================================================================
--- schily-2018-08-24.orig/rmt/rmt.dfl --- schily-2018-10-30.orig/rmt/rmt.dfl
+++ schily-2018-08-24/rmt/rmt.dfl +++ schily-2018-10-30/rmt/rmt.dfl
@@ -18,15 +18,13 @@ @@ -18,15 +18,13 @@
# Each USER= entry adds the listed user to the users who may run rmt # Each USER= entry adds the listed user to the users who may run rmt
# #
@ -186,10 +186,10 @@ Index: schily-2018-08-24/rmt/rmt.dfl
-ACCESS=* * /dev/zero -ACCESS=* * /dev/zero
+#ACCESS=* * /dev/zero +#ACCESS=* * /dev/zero
#ACCESS=* * * #ACCESS=* * *
Index: schily-2018-08-24/star/all.mk Index: schily-2018-10-30/star/all.mk
=================================================================== ===================================================================
--- schily-2018-08-24.orig/star/all.mk --- schily-2018-10-30.orig/star/all.mk
+++ schily-2018-08-24/star/all.mk +++ schily-2018-10-30/star/all.mk
@@ -12,7 +12,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to @@ -12,7 +12,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
# and copy star_fat.mk to Makefile. # and copy star_fat.mk to Makefile.
# #
@ -199,10 +199,10 @@ Index: schily-2018-08-24/star/all.mk
########################################################################### ###########################################################################
include $(SRCROOT)/$(RULESDIR)/rules.mks include $(SRCROOT)/$(RULESDIR)/rules.mks
Index: schily-2018-08-24/star/pax.mk Index: schily-2018-10-30/star/pax.mk
=================================================================== ===================================================================
--- schily-2018-08-24.orig/star/pax.mk --- schily-2018-10-30.orig/star/pax.mk
+++ schily-2018-08-24/star/pax.mk +++ schily-2018-10-30/star/pax.mk
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin INSDIR= bin
@ -212,10 +212,10 @@ Index: schily-2018-08-24/star/pax.mk
CPPOPTS += -D__STAR__ CPPOPTS += -D__STAR__
CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
#CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP #CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP
Index: schily-2018-08-24/star/star.mk Index: schily-2018-10-30/star/star.mk
=================================================================== ===================================================================
--- schily-2018-08-24.orig/star/star.mk --- schily-2018-10-30.orig/star/star.mk
+++ schily-2018-08-24/star/star.mk +++ schily-2018-10-30/star/star.mk
@@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to @@ -8,7 +8,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to
INSDIR= bin INSDIR= bin
@ -225,21 +225,11 @@ Index: schily-2018-08-24/star/star.mk
CPPOPTS += -D__STAR__ CPPOPTS += -D__STAR__
CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP -DUSE_REMOTE -DUSE_RCMD_RSH
#CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP #CPPOPTS += -DSET_CTIME -DFIFO -DUSE_MMAP
@@ -23,6 +23,7 @@ CPPOPTS += -DCOPY_LINKS_DELAYED @@ -38,7 +38,7 @@ HFILES= star.h starsubs.h dirtime.h xta
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 \ movearch.h table.h props.h fifo.h diff.h restore.h \
checkerr.h dumpdate.h bitstring.h checkerr.h dumpdate.h bitstring.h
-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
-XMK_FILE= Makefile.man starformatman.mk -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 +XMK_FILE= Makefile.man
########################################################################### ###########################################################################

6
schily.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 8 09:32:40 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Trim SELINUX from schily-2018-05-25_star_configuration.patch,
it is already determined by %configure now.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 6 16:33:45 UTC 2018 - Jan Engelhardt <jengelh@inai.de> Tue Nov 6 16:33:45 UTC 2018 - Jan Engelhardt <jengelh@inai.de>