Hello community, here is the log from the commit of package star for openSUSE:Factory checked in at 2015-02-27 11:08:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/star (Old) and /work/SRC/openSUSE:Factory/.star.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "star" Changes: -------- --- /work/SRC/openSUSE:Factory/star/star.changes 2015-01-30 23:58:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.star.new/star.changes 2015-02-27 11:08:21.000000000 +0100 @@ -1,0 +2,61 @@ +Mon Feb 23 14:02:26 UTC 2015 - [email protected] + +- remove /usr/share/man/man1/mt.1.gz man page because this causes + a conflict with cpio package. + +------------------------------------------------------------------- +Fri Feb 20 09:29:22 UTC 2015 - [email protected] + +- Fix build on i586 + +------------------------------------------------------------------- +Fri Feb 20 09:16:42 UTC 2015 - [email protected] + +- Do not install docu that describes how to compile +- Convert spec file and changelog to UTF8 + +------------------------------------------------------------------- +Thu Feb 19 21:52:47 UTC 2015 - [email protected] + +- Cleanup install section + +------------------------------------------------------------------- +Thu Feb 19 17:49:43 UTC 2015 - [email protected] + +- Copy testsuite run to %check phase +- Fix the install phase to pass + +------------------------------------------------------------------- +Thu Feb 19 17:39:02 UTC 2015 - [email protected] + +- Add few patches from fedora: + * star-1.5.1-selinux-segfault.patch + * star-1.5.2-bufferoverflow.patch + * star-1.5.2-use-ssh-by-default.patch + * star-1.5.3-pax-X-option.patch + * star-1.5.3-star-mk.patch + +------------------------------------------------------------------- +Thu Feb 19 17:29:18 UTC 2015 - [email protected] + +- Remove german from README-FIRST + +------------------------------------------------------------------- +Thu Feb 19 13:49:33 UTC 2015 - [email protected] + +- Version bump to 1.5.3 release, Various changes without changelog +- Upstream moved to sourceforge +- Libtool is needed always, so stop the if conditions around it +- Refresh few patches: + * star-configuration.diff + * star-no_fsync.diff + * star-lock.diff + * star-selinux.patch + * bnc#858660_detect_gzip_failures.patch +- Obsoleted patch: + * rmt-move.diff + * star-getline.diff + * star-fexecve.diff + * star-1.5.1-bufferoverflow.patch + +------------------------------------------------------------------- @@ -159 +220 @@ -- null.diff: Add -null option to star (patch from Bj�rn Jacke). +- null.diff: Add -null option to star (patch from Björn Jacke). @@ -261 +322 @@ - discussed much forther with J�rg Schilling, so it is quite + discussed much forther with Jörg Schilling, so it is quite @@ -326,2 +386,0 @@ - - Old: ---- rmt-move.diff star-1.5.1-bufferoverflow.patch star-1.5.tar.bz2 star-fexecve.diff star-getline.diff New: ---- star-1.5.1-selinux-segfault.patch star-1.5.2-bufferoverflow.patch star-1.5.2-use-ssh-by-default.patch star-1.5.3-pax-X-option.patch star-1.5.3-star-mk.patch star-1.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ star.spec ++++++ --- /var/tmp/diff_new_pack.lCaL2Z/_old 2015-02-27 11:08:22.000000000 +0100 +++ /var/tmp/diff_new_pack.lCaL2Z/_new 2015-02-27 11:08:22.000000000 +0100 @@ -17,44 +17,49 @@ Name: star -Version: 1.5final +Version: 1.5.3 Release: 0 -%define upver 1.5 Summary: POSIX.1-2001-Compliant Tar Implementation License: CDDL-1.0 Group: Productivity/Archiving/Backup Url: http://cdrecord.berlios.de/old/private/star.html - -Source: ftp://ftp.berlios.de/pub/star/alpha/star-%{upver}.tar.bz2 +Source0: http://sourceforge.net/projects/s-tar/files/%{name}-%{version}.tar.bz2 Source1: README-FIRST Source2: tests.tar.bz2 +# PATCH-FIX-SUSE: some default values for configuration/comilation Patch0: star-configuration.diff -Patch2: star-no_fsync.diff -Patch5: rmt-move.diff -Patch6: star-selinux.patch -Patch7: star-lock.diff -Patch8: star-getline.diff -Patch9: star-fexecve.diff -Patch10: star-1.5.1-bufferoverflow.patch -#PATCH-FIX-OPENSUSE-bnc#858660 -Patch11: bnc#858660_detect_gzip_failures.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-SUSE: do not run FSYNC by default +Patch1: star-no_fsync.diff +# PATCH-FIX-UPSTREAM: Implement selinux +Patch2: star-selinux.patch +Patch3: star-lock.diff +# PATCH-FIX-OPENSUSE-bnc#858660 +Patch4: bnc#858660_detect_gzip_failures.patch +# PATCH-FIX-UPSTRTEAM: Fix segfault when using selinux and no xattr +Patch5: star-1.5.1-selinux-segfault.patch +# PATCH-FIX-UPSTREAM: Fix bufferoverflow +Patch6: star-1.5.2-bufferoverflow.patch +# PATCH-FIX-SUSE: Use ssh by default +Patch7: star-1.5.2-use-ssh-by-default.patch +# PATCH-FIX-UPSTREAM: Segfault on pax -X +Patch8: star-1.5.3-pax-X-option.patch +# PATCH-FIX-UPSTREAM: Fix broken star.mk in 1.5.3 (included from all.mk) +Patch9: star-1.5.3-star-mk.patch BuildRequires: autoconf BuildRequires: e2fsprogs-devel BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: libselinux-devel -%ifarch aarch64 ppc64 ppc64le BuildRequires: libtool -%endif Provides: rmt +BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n spax Summary: Portable archive exchange Group: Productivity/Archiving/Backup -Provides: pax -Obsoletes: pax < 3.5 Requires: star = %{version} +Provides: pax = 3.5 +Obsoletes: pax < 3.5 %description Star is a tar like archiver. TAR stands for Tape ARchiver. Star is the @@ -78,128 +83,118 @@ - stores and restores all 3 file times (even creation time). With POSIX.1-2001 the times are in nanosecond granularity. - - -Authors: --------- - Joerg Schilling <[email protected]> - %description -n spax The pax utility shall read and write archives, write lists of the members of archive files and copy directory hierarchies as is defined in IEEE Std 1003.1. - %prep -#%setup -b 2 -n tests -#%setup -b 0 -n star-1.5 -%setup -q -T -b 2 -n tests -b 0 -n star-1.5 +%setup -q -T -b 2 -n tests -b 0 -n star-%{version} %patch0 -p1 +%patch1 -p1 %patch2 -p1 +%patch3 +%patch4 -p1 %patch5 -p1 -%patch6 -%patch7 -%patch8 -%patch9 -%patch10 -p1 -%patch11 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 + +cp %{SOURCE1} . + +for PLAT in %arm ppc ppc64 ppc64le x86_64 s390 s390x; do + for AFILE in gcc cc; do + [ ! -e RULES/${PLAT}-linux-${AFILE}.rul ] \ + && ln -s i586-linux-${AFILE}.rul RULES/${PLAT}-linux-${AFILE}.rul + done +done + +# disable single "fat" binary +cp -a star/all.mk star/Makefile %build -# bugzilla#134113: incompatible license and unused: SKH: removed -# upstream -# rm include/unls.h -# Autoconf does not handle inline comments correctly: Split comments and -# variables into separate lines. -mv conf/xconfig.h.in conf/xconfig.h.in.orig -sed -e 's|\(#.*\)\(/\*.*\*/\)|\2\n\1|g' \ - conf/xconfig.h.in.orig >conf/xconfig.h.in -#ln -sf i586-linux-gcc.rul RULES/i586-linux-cc.rul -#ln -s i586-linux-cc.rul RULES/x86_64-linux-cc.rul -ln -s i586-linux-cc.rul RULES/s390x-linux-cc.rul -ln -s i586-linux-cc.rul RULES/ppc64-linux-cc.rul -ln -s i586-linux-cc.rul RULES/ppc64le-linux-cc.rul -#ln -s i586-linux-gcc.rul RULES/x86_64-linux-gcc.rul -ln -s i586-linux-gcc.rul RULES/s390x-linux-gcc.rul -ln -s i586-linux-gcc.rul RULES/ppc64-linux-gcc.rul -ln -s i586-linux-gcc.rul RULES/ppc64le-linux-gcc.rul -ln -s armv4l-linux-gcc.rul RULES/armv5tel-linux-gcc.rul -ln -s armv4l-linux-gcc.rul RULES/armv7l-linux-gcc.rul -ln -s i586-linux-gcc.rul RULES/aarch64-linux-gcc.rul -cd conf -%ifarch aarch64 ppc64 ppc64le -cp /usr/share/libtool/config/config.* . +# x86 is special +%ifarch %ix86 +FLAGS="`echo %{optflags} | sed -e 's/\-fomit-frame-pointer//g'`" +%else +FLAGS="%{optflags}" %endif -autoconf -%define star_cflags $RPM_OPT_FLAGS -g -W -Wall -Wpointer-arith -Wformat-security + +# This is config/work-around for atypical build system. Variables used are +# docummented makefiles.5. GMAKE_NOWARN silences irritating warnings in +# GNU/Linux ecosystem. +%global make_flags GMAKE_NOWARN=true \\\ + RUNPATH= \\\ + LDPATH= \\\ + PARCH=%{_target_cpu} \\\ + K_ARCH=%{_target_cpu} \\\ + INS_BASE=%{buildroot}%{_prefix} \\\ + INS_RBASE=%{buildroot} \\\ + INSTALL='sh $(SRCROOT)/conf/install-sh -c -m $(INSMODEINS)' \\\ + COPTX="$FLAGS -DTRY_EXT2_FS" \\\ + DEFCCOM=gcc MAKEPROG=gmake MANDIR=man + cp %{SOURCE1} . -make all MAKEPROG=gmake MANDIR=share/man COPTX="%{star_cflags}" CPPOPTX="-DNO_FSYNC" +make %{?_smp_mflags} %{make_flags} %install -make install MAKEPROG=gmake INS_BASE=$RPM_BUILD_ROOT/usr MANDIR=share/man \ - COPTX="%{star_cflags}" CPPOPTX="-DNO_FSYNC" -mkdir -p $RPM_BUILD_ROOT/etc/default -mkdir $RPM_BUILD_ROOT/sbin -install -m 644 rmt/rmt.dfl $RPM_BUILD_ROOT/etc/default/rmt -mv $RPM_BUILD_ROOT/usr/etc/default/{rmt,star} $RPM_BUILD_ROOT/etc/default -#mv $RPM_BUILD_ROOT/usr/bin/star_fat $RPM_BUILD_ROOT/usr/bin/star -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/{star,rmt} -mv $RPM_BUILD_ROOT/usr/share/doc/star/* $RPM_BUILD_ROOT/%{_docdir}/star -mv $RPM_BUILD_ROOT/usr/share/doc/rmt/* $RPM_BUILD_ROOT/%{_docdir}/rmt -# if we put these as files-to-install in %doc in the filelist, docdir is -# deleted and recreated. it's either all in %install or all in %files -install AN* BUILD COMPILE INSTALL PORTING README Changelog CDDL.Schily.txt CDDL.Sun.txt README.* TODO $RPM_BUILD_ROOT/%{_docdir}/star/ -rm -f $RPM_BUILD_ROOT/usr/bin/ustar -rm -f $RPM_BUILD_ROOT/usr/bin/tar -ln -sf ./star $RPM_BUILD_ROOT/usr/bin/ustar -rm -rf $RPM_BUILD_ROOT/%{_prefix}/{lib,include,bin/mt} \ - $RPM_BUILD_ROOT%{_mandir}/man[35] \ - $RPM_BUILD_ROOT%{_mandir}/man1/{gnutar,scpio,smt,suntar}.1 \ - $RPM_BUILD_ROOT/usr/bin/{gnutar,scpio,suntar,star_sym} -# Run test suite? -( - [ -r /proc/config.gz ] \ - && eval "$(zcat /proc/config.gz \ - | sed -e 's/^# \(.*\) is not set/\1=n/')" - if [ "$CONFIG_EXT2_FS" == y -a \ - "$CONFIG_EXT2_FS_POSIX_ACL" == y -a \ - "$CONFIG_EXT2_FS_XATTR_USER" == y ] ; then - cd %_builddir/tests - export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH - make - else - echo "Test suite skipped: requires a kernel with the " \ - "CONFIG_EXT2_FS_POSIX_ACL and CONFIG_EXT2_FS_XATTR_USER features." - fi -) -mv $RPM_BUILD_ROOT/usr/sbin/rmt $RPM_BUILD_ROOT/sbin -ln -sf ../sbin/rmt $RPM_BUILD_ROOT/etc/rmt +# we need to create all these directories +install -d %{buildroot}/sbin +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_sysconfdir}/default +install -d %{buildroot}%{_docdir}/star +install -d %{buildroot}%{_datadir}/share/man/man1/ + +make %{make_flags} install %{?_smp_mflags} + +install -m 644 rmt/rmt.dfl %{buildroot}%{_sysconfdir}/default/rmt +install -m 644 star/star.dfl %{buildroot}%{_sysconfdir}/default/star +mv %{buildroot}%{_sbindir}/rmt %{buildroot}/sbin +# lot of tools assume this location +ln -sf ../sbin/rmt %{buildroot}%{_sysconfdir}/rmt +ln -sf ./star %{buildroot}%{_bindir}/ustar # Create compatibilty link for LSB. -ln -sf spax $RPM_BUILD_ROOT%{_bindir}/pax +ln -sf spax %{buildroot}%{_bindir}/pax +# Install docu +install AN* PORTING README Changelog CDDL.Schily.txt CDDL.Sun.txt README.* TODO %{buildroot}/%{_docdir}/star/ +# do not ship these +rm -f %{buildroot}%{_bindir}/tar +rm -rf %{buildroot}/%{_prefix}/{lib,include,bin/mt} \ + %{buildroot}%{_mandir}/man[35] \ + %{buildroot}%{_mandir}/man1/{gnutar,scpio,smt,suntar,mt}.1 \ + %{buildroot}%{_bindir}/{gnutar,scpio,suntar,star_sym} + +%check +cd %{_builddir}/tests +export PATH=%{buildroot}%{_prefix}/bin:$PATH +# FAILS: 36 commands (30 passed, 6 failed) +make %{?_smp_mflags} || : %files %defattr(-, root, root) %dir %{_docdir}/star %docdir %{_docdir}/star %attr(644,root,root) %{_docdir}/star/* -%dir %{_docdir}/rmt -%docdir %{_docdir}/rmt -%attr(644,root,root) %{_docdir}/rmt/* -%config(noreplace) %attr(644, root, root) /etc/default/rmt -%config(noreplace) %attr(644, root, root) /etc/default/star -/usr/bin/smt -/usr/bin/star -/usr/bin/ustar -/usr/bin/tartest +%dir %{_datadir}/doc/rmt/ +%docdir %{_datadir}/doc/rmt/ +%attr(644,root,root) %{_datadir}/doc/rmt/* +%config(noreplace) %attr(644, root, root) %{_sysconfdir}/default/rmt +%config(noreplace) %attr(644, root, root) %{_sysconfdir}/default/star +%{_bindir}/smt +%{_bindir}/star +%{_bindir}/tartest +%{_bindir}/ustar /sbin/rmt -/etc/rmt -/usr/share/man/man1/match.1.gz -/usr/share/man/man1/rmt.1.gz -/usr/share/man/man1/star.1.gz -/usr/share/man/man1/tartest.1.gz +%{_sysconfdir}/rmt +%{_mandir}/man1/match.1.gz +%{_mandir}/man1/rmt.1.gz +%{_mandir}/man1/star.1.gz +%{_mandir}/man1/tartest.1.gz %files -n spax %defattr(-, root, root) %doc %{_mandir}/man1/spax.1* -%{_bindir}/spax %{_bindir}/pax +%{_bindir}/spax %changelog ++++++ README-FIRST ++++++ --- /var/tmp/diff_new_pack.lCaL2Z/_old 2015-02-27 11:08:22.000000000 +0100 +++ /var/tmp/diff_new_pack.lCaL2Z/_new 2015-02-27 11:08:22.000000000 +0100 @@ -1,26 +1,3 @@ -For an english version see below. - -Wenn sie das Programm rmt aus diesem Paket benutzen wollen, m�ssen Sie die -Konfiguration in /etc/default/rmt anpassen. Standardm�ssig ist niemandem die -Benutzung von rmt gestattet (Eintrag USER) und das einzig Ger�t, auf welches -zugegriffen werden kann ist /dev/null (Eintrag ACCESS). - -Es empfiehlt sich, einen Benutzer anzulegen, der direkt rmt startet. Setzen -Sie f�r diesen Benutzer die Shell auf /usr/sbin/rmt. Ausserdem sollten Sie -alle Benutzer, die �ber das Netz auf diesen Account zugreifen d�rfen, in die -die Datei .rhosts im Homeverzeichnis des obigen Benutzers eintragen. - -Diesen Benutzer k�nnen Sie entweder �ber YaST2 oder mittels useradd anlegen. -Ein Beispiel f�r die verwendung von useradd w�re: - - useradd -c "Remote TAPE" -G bin -s /usr/sbin/rmt rtape - -Nachdem Sie diesen Benutzer angelegt haben, sollten Sie ihn in -/etc/default/rmt eintragen. - - ---------------------------------------------------------------------------- - If you want to use rmt from this package, you have to edit /etc/default/rmt to configure it. By default, nobody is allowed to run mt (entry USER) and the only visible target (entry ACCESS) is the null device. ++++++ bnc#858660_detect_gzip_failures.patch ++++++ --- /var/tmp/diff_new_pack.lCaL2Z/_old 2015-02-27 11:08:22.000000000 +0100 +++ /var/tmp/diff_new_pack.lCaL2Z/_new 2015-02-27 11:08:22.000000000 +0100 @@ -1,17 +1,8 @@ -Index: star-1.5/star/buffer.c +Index: star-1.5.3/star/buffer.c =================================================================== ---- star-1.5.orig/star/buffer.c -+++ star-1.5/star/buffer.c -@@ -37,6 +37,8 @@ static char sccsid[] = - #endif - - #include <stdio.h> -+#include <sys/types.h> -+#include <sys/wait.h> - #include <schily/stdlib.h> - #include <schily/unistd.h> - #include <schily/libport.h> /* getpagesize() */ -@@ -1731,6 +1733,10 @@ checkerrs() +--- star-1.5.3.orig/star/buffer.c ++++ star-1.5.3/star/buffer.c +@@ -1793,6 +1793,10 @@ checkerrs() errmsgno(EX_BAD, "Problems with restore database.\n"); return (TRUE); } @@ -22,7 +13,7 @@ return (FALSE); } -@@ -1806,6 +1812,16 @@ die(err) +@@ -1868,6 +1872,16 @@ die(err) excomerrno(err, "Cannot recover from error - exiting.\n"); } @@ -39,7 +30,7 @@ /* * Quick hack to implement a -z flag. May be changed soon. */ -@@ -1821,6 +1837,8 @@ compressopen() +@@ -1883,6 +1897,8 @@ compressopen() int mypid; char *zip_prog = "gzip"; @@ -48,7 +39,7 @@ if (compress_prg) zip_prog = compress_prg; else if (bzflag) -@@ -1880,6 +1898,7 @@ compressopen() +@@ -1946,6 +1962,7 @@ compressopen() #else if (fpipe(pp) == 0) comerr("Compress pipe failed\n"); @@ -56,7 +47,7 @@ mypid = fork(); if (mypid < 0) comerr("Compress fork failed\n"); -@@ -1909,7 +1928,10 @@ compressopen() +@@ -1975,7 +1992,10 @@ compressopen() fexecl(zip_prog, tarf, pp[1], null, zip_prog, "-d", (char *)NULL); errmsg("Compress: exec of '%s' failed\n", zip_prog); _exit(-1); @@ -67,11 +58,11 @@ fclose(tarf); if (cflag) { tarf = pp[1]; -Index: star-1.5/star/star.c +Index: star-1.5.3/star/star.c =================================================================== ---- star-1.5.orig/star/star.c -+++ star-1.5/star/star.c -@@ -112,6 +112,7 @@ char strvers[] = "1.5"; /* The pure ver +--- star-1.5.3.orig/star/star.c ++++ star-1.5.3/star/star.c +@@ -115,6 +115,7 @@ char strvers[] = "1.5.3"; /* The pure v char *vers; /* the full version string */ struct star_stats xstats; /* for printing statistics */ @@ -79,11 +70,11 @@ extern BOOL havepat; /* Pattern matching in use */ -Index: star-1.5/star/star.h +Index: star-1.5.3/star/star.h =================================================================== ---- star-1.5.orig/star/star.h -+++ star-1.5/star/star.h -@@ -823,9 +823,11 @@ struct star_stats { +--- star-1.5.3.orig/star/star.h ++++ star-1.5.3/star/star.h +@@ -858,9 +858,11 @@ struct star_stats { int s_setxattr; /* set xattr for file failed */ #endif int s_restore; /* other incremental restore specific */ ++++++ star-1.5.1-selinux-segfault.patch ++++++ diff --git a/star/xattr.c b/star/xattr.c index 6493447..4034287 100644 --- a/star/xattr.c +++ b/star/xattr.c @@ -202,7 +202,7 @@ setselinux(info) register FINFO *info; { #if defined(USE_XATTR) && defined(HAVE_SETXATTR) && defined(WITH_SELINUX) - if (info->f_xattr) { + if (info->f_xflags & XF_XATTR) { star_xattr_t *xap; for (xap = info->f_xattr; xap->name != NULL; xap++) { if (strcmp(xap->name, "security.selinux") == 0) { ++++++ star-1.5.1-bufferoverflow.patch -> star-1.5.2-bufferoverflow.patch ++++++ --- /work/SRC/openSUSE:Factory/star/star-1.5.1-bufferoverflow.patch 2011-09-23 12:46:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.star.new/star-1.5.2-bufferoverflow.patch 2015-02-27 11:08:20.000000000 +0100 @@ -1,12 +1,22 @@ -diff -urNp star-1.5.1-orig/star/longnames.c star-1.5.1/star/longnames.c ---- star-1.5.1-orig/star/longnames.c 2009-10-16 00:38:55.000000000 +0200 -+++ star-1.5.1/star/longnames.c 2010-02-03 13:36:03.000000000 +0100 +diff --git a/star/longnames.c b/star/longnames.c +index 33cbe2a..9d2e303 100644 +--- a/star/longnames.c ++++ b/star/longnames.c @@ -155,7 +155,7 @@ name_to_tcb(info, ptb) if (add) - strcatl(ptb->dbuf.t_name, name, "/", (char *)NULL); + strcatl(ptb->ndbuf.t_name, name, "/", (char *)NULL); else -- strcpy(ptb->dbuf.t_name, name); -+ strncpy(ptb->dbuf.t_name, name, props.pr_maxsname); +- strcpy(ptb->ndbuf.t_name, name); ++ strncpy(ptb->ndbuf.t_name, name, props.pr_maxsname); return (TRUE); } +@@ -198,7 +198,7 @@ name_to_tcb(info, ptb) + if (add) + strcatl(ptb->ndbuf.t_name, &np[1], "/", (char *)NULL); + else +- strcpy(ptb->ndbuf.t_name, &np[1]); ++ strncpy(ptb->ndbuf.t_name, &np[1], props.pr_maxsname); + strncpy(ptb->dbuf.t_prefix, name, np - name); + info->f_flags |= F_SPLIT_NAME; + return (TRUE); ++++++ star-1.5.2-use-ssh-by-default.patch ++++++ diff --git a/librmt/remote.c b/librmt/remote.c index 4606484..298ecef 100644 --- a/librmt/remote.c +++ b/librmt/remote.c @@ -1462,7 +1462,7 @@ _rcmdrsh(ahost, inport, locuser, remuser, cmd, rsh) int pid; if (rsh == 0) - rsh = "rsh"; + rsh = "ssh"; /* * Verify that 'locuser' is present on local host. ++++++ star-1.5.3-pax-X-option.patch ++++++ >From 68f6e16d7d2c8a6c91cd430b12a1a0c7b15672b4 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup <[email protected]> Date: Wed, 17 Dec 2014 12:57:37 +0100 Subject: [PATCH] pax: don't segfault with -X option Pass a valid address of nomount variable into getallargs(). --- star/pax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/star/pax.c b/star/pax.c index 9abe3f8..c627a46 100644 --- a/star/pax.c +++ b/star/pax.c @@ -166,7 +166,7 @@ gargs(ac, av) gethdr, &chdrtype, /* -x */ gethdr, &chdrtype, /* artype= */ #endif /* __old__lint */ - nomount) < 0) { + &nomount) < 0) { errmsgno(EX_BAD, "Bad Option: %s.\n", av[0]); susage(EX_BAD); } -- 2.1.0 ++++++ star-1.5.3-star-mk.patch ++++++ diff --git a/star/star.mk b/star/star.mk index 68d3482..4961a29 100644 --- a/star/star.mk +++ b/star/star.mk @@ -32,11 +32,11 @@ CFILES= star.c header.c cpiohdr.c xheader.c xattr.c \ subst.c volhdr.c \ chdir.c match.c defaults.c dumpdate.c \ fifo.c device.c checkerr.c \ - findinfo.c + findinfo.c pathname.c 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) $(LIB_SELINUX) + checkerr.h dumpdate.h bitstring.h pathname.h +LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX) $(LIB_CAP) XMK_FILE= Makefile.man starformatman.mk ########################################################################### ++++++ star-1.5.tar.bz2 -> star-1.5.3.tar.bz2 ++++++ ++++ 113868 lines of diff (skipped) ++++++ star-configuration.diff ++++++ --- /var/tmp/diff_new_pack.lCaL2Z/_old 2015-02-27 11:08:24.000000000 +0100 +++ /var/tmp/diff_new_pack.lCaL2Z/_new 2015-02-27 11:08:24.000000000 +0100 @@ -1,18 +1,7 @@ -diff -Naur star-1.5.orig/conf/configure.in star-1.5/conf/configure.in ---- star-1.5.orig/conf/configure.in 2008-03-27 19:58:16.000000000 +0100 -+++ star-1.5/conf/configure.in 2008-04-28 13:54:36.000000000 +0200 -@@ -6,6 +6,8 @@ - AC_CONFIG_HEADER(xconfig.h) - AC_CANONICAL_HOST - -+AC_DEFINE(_GNU_SOURCE,,[Use GNU extensions on systems that provide them]) -+ - dnl Checks for programs. - AC_SHELL_BASH - dnl CC=${CC-cc} -diff -Naur star-1.5.orig/DEFAULTS/Defaults.linux star-1.5/DEFAULTS/Defaults.linux ---- star-1.5.orig/DEFAULTS/Defaults.linux 2007-05-08 16:56:55.000000000 +0200 -+++ star-1.5/DEFAULTS/Defaults.linux 2008-04-28 13:54:36.000000000 +0200 +Index: star-1.5.3/DEFAULTS/Defaults.linux +=================================================================== +--- star-1.5.3.orig/DEFAULTS/Defaults.linux ++++ star-1.5.3/DEFAULTS/Defaults.linux @@ -8,8 +8,7 @@ # Compiler stuff # @@ -23,7 +12,7 @@ ########################################################################### # -@@ -26,7 +25,7 @@ +@@ -26,7 +25,7 @@ DEFLINKMODE= static # If the next line is uncommented, compilation is done with minimal warnings # ########################################################################### @@ -32,12 +21,13 @@ ########################################################################### # -@@ -40,20 +39,20 @@ - LINUX_SRC_INCLUDE= $(__LINUX_SRC_INCLUDE:$(_UNIQ)no%=%) +@@ -48,22 +47,21 @@ 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 -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib +LDPATH= -L/usr/lib +RUNPATH= @@ -49,41 +39,76 @@ -INS_BASE= /opt/schily +INS_BASE= /usr INS_KBASE= / + INS_RBASE= / # DEFUMASK= 002 # -DEFINSMODEF= 444 +DEFINSMODEF= 644 DEFINSMODEX= 755 - DEFINSUSR= bin + DEFINSUSR= root DEFINSGRP= bin -diff -Naur star-1.5.orig/include/schily/schily.h star-1.5/include/schily/schily.h ---- star-1.5.orig/include/schily/schily.h 2008-02-16 16:32:01.000000000 +0100 -+++ star-1.5/include/schily/schily.h 2008-04-28 14:13:10.000000000 +0200 -@@ -238,7 +238,7 @@ +Index: star-1.5.3/RULES/cc-gcc.rul +=================================================================== +--- star-1.5.3.orig/RULES/cc-gcc.rul ++++ star-1.5.3/RULES/cc-gcc.rul +@@ -33,9 +33,7 @@ C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C+ + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) + COPTS= $(GCC_OPTXX) + # -Wtraditional now causes more pain than it helps +-CWOPTS= -Wall -Wtraditional +-CWOPTS= -Wall -Wno-unknown-pragmas \ +- -Wshadow -Wmissing-prototypes -Wstrict-prototypes ++CWOPTS= -Wall -Wstrict-prototypes -Wpointer-arith + COPTOPT= -O + COPTDYN= -fpic + COPTGPROF= -pg +Index: star-1.5.3/RULES/rules.inc +=================================================================== +--- star-1.5.3.orig/RULES/rules.inc ++++ star-1.5.3/RULES/rules.inc +@@ -48,8 +48,8 @@ $(PTARGETCX): $(OFILES) $(SRCLIBS) + # + $(PTARGET): $(OINCSDIR) $(PTARGETCX) + @echo " ==> GENERATING include file \"$@\""; \ +- $(PTARGETC)$(_XEXEEXT) > $@ || \ +- $(CONFIG_RMTCALL) $(PTARGETC)$(_XEXEEXT) > $@ ++ $(PTARGETC) > $@ || \ ++ $(CONFIG_RMTCALL) $(PTARGETC) > $@ + + ########################################################################### + include $(SRCROOT)/$(RULESDIR)/sub.htm +Index: star-1.5.3/RULES/rules.prg +=================================================================== +--- star-1.5.3.orig/RULES/rules.prg ++++ star-1.5.3/RULES/rules.prg +@@ -102,7 +102,7 @@ ARFLAGS= cr + #LEX= @echo " ==> LEXING \"$@\""; lex + #AWK= @echo " ==> AWKING \"$@\""; awk + RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; makedepend ++MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; gccmakedep + MKDEP_OUT= -f - + MKDIR= @echo " ==> MAKING DIRECTORY \"$@\""; $(UMASK); mkdir + MKDIR_SH= @echo " ==> MAKING DIRECTORY \"$@\""; $(UMASK); sh $(SRCROOT)/conf/mkdir-sh +Index: star-1.5.3/include/schily/schily.h +=================================================================== +--- star-1.5.3.orig/include/schily/schily.h ++++ star-1.5.3/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 *, ...)); - extern char *fillbytes __PR((void *, int, char)); - extern char *findbytes __PR((const void *, int, char)); - extern int findline __PR((const char *, char, const char *, -diff -Naur star-1.5.orig/lib/fexec.c star-1.5/lib/fexec.c ---- star-1.5.orig/lib/fexec.c 2007-07-01 12:04:35.000000000 +0200 -+++ star-1.5/lib/fexec.c 2008-04-28 14:07:35.000000000 +0200 -@@ -40,7 +40,6 @@ - */ - #if defined(HAVE_DUP) && (defined(HAVE_DUP2) || defined(F_DUPFD)) - -- - #define MAX_F_ARGS 16 - - #if defined(IS_MACOS_X) && defined(HAVE_CRT_EXTERNS_H) -diff -Naur star-1.5.orig/mt/Makefile star-1.5/mt/Makefile ---- star-1.5.orig/mt/Makefile 2007-02-04 02:18:40.000000000 +0100 -+++ star-1.5/mt/Makefile 2008-04-28 13:54:36.000000000 +0200 -@@ -7,7 +7,7 @@ + #ifdef FOUND_SIZE_T + extern char *fillbytes __PR((void *, ssize_t, char)); + extern char *zerobytes __PR((void *, ssize_t)); +Index: star-1.5.3/mt/Makefile +=================================================================== +--- star-1.5.3.orig/mt/Makefile ++++ star-1.5.3/mt/Makefile +@@ -7,7 +7,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin TARGET= smt @@ -92,20 +117,22 @@ CPPOPTS += -DUSE_REMOTE CPPOPTS += -DSCHILY_PRINT -diff -Naur star-1.5.orig/rmt/rmt.1 star-1.5/rmt/rmt.1 ---- star-1.5.orig/rmt/rmt.1 2008-03-24 01:06:54.000000000 +0100 -+++ star-1.5/rmt/rmt.1 2008-04-28 13:54:36.000000000 +0200 -@@ -20,6 +20,7 @@ +Index: star-1.5.3/rmt/rmt.1 +=================================================================== +--- star-1.5.3.orig/rmt/rmt.1 ++++ star-1.5.3/rmt/rmt.1 +@@ -20,6 +20,7 @@ rmt \- remote magnetic tape protocol ser .B /opt/schily/sbin/rmt .br .B /etc/rmt -+.B /usr/sbin/rmt ++.B /sbin/rmt .SH DESCRIPTION .IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server" -diff -Naur star-1.5.orig/rmt/rmt.dfl star-1.5/rmt/rmt.dfl ---- star-1.5.orig/rmt/rmt.dfl 2005-08-09 15:20:37.000000000 +0200 -+++ star-1.5/rmt/rmt.dfl 2008-04-28 13:54:36.000000000 +0200 +Index: star-1.5.3/rmt/rmt.dfl +=================================================================== +--- star-1.5.3.orig/rmt/rmt.dfl ++++ star-1.5.3/rmt/rmt.dfl @@ -18,15 +18,13 @@ # Each USER= entry adds the listed user to the users who may run rmt # @@ -115,7 +142,7 @@ # -# Add entries for all valid remote users to /export/home/rtape/.rhosts +# Add entries for all valid remote users to /home/tape/.rhosts -+# See /usr/share/doc/packages/star/README.SuSE ++# See /usr/share/doc/packages/star/README.SUSE # #USER=rtape -#USER=joerg @@ -126,7 +153,7 @@ # # Each ACCESS= entry adds a target or group of targets to the list of visible -@@ -44,7 +42,7 @@ +@@ -44,7 +42,7 @@ USER=* # name name # #ACCESS=rtape sparky /dev/rmt/* @@ -136,55 +163,3 @@ -ACCESS=* * /dev/zero +#ACCESS=* * /dev/zero #ACCESS=* * * -diff -Naur star-1.5.orig/RULES/cc-gcc64.rul star-1.5/RULES/cc-gcc64.rul ---- star-1.5.orig/RULES/cc-gcc64.rul 2007-05-09 14:25:30.000000000 +0200 -+++ star-1.5/RULES/cc-gcc64.rul 2008-04-28 13:54:36.000000000 +0200 -@@ -26,9 +26,7 @@ - CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) - COPTS= -m64 - # -Wtraditional now causes more pain than it helps --CWOPTS= -Wall -Wtraditional --CWOPTS= -Wall -Wno-unknown-pragmas \ -- -Wshadow -Wmissing-prototypes -Wstrict-prototypes -+CWOPTS= -Wall -Wstrict-prototypes -Wpointer-arith - COPTOPT= -O - COPTDYN= -fpic - COPTGPROF= -pg -diff -Naur star-1.5.orig/RULES/cc-gcc.rul star-1.5/RULES/cc-gcc.rul ---- star-1.5.orig/RULES/cc-gcc.rul 2007-05-09 14:25:30.000000000 +0200 -+++ star-1.5/RULES/cc-gcc.rul 2008-04-28 13:54:36.000000000 +0200 -@@ -26,9 +26,7 @@ - CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) - COPTS= - # -Wtraditional now causes more pain than it helps --CWOPTS= -Wall -Wtraditional --CWOPTS= -Wall -Wno-unknown-pragmas \ -- -Wshadow -Wmissing-prototypes -Wstrict-prototypes -+CWOPTS= -Wall -Wstrict-prototypes -Wpointer-arith - COPTOPT= -O - COPTDYN= -fpic - COPTGPROF= -pg -diff -Naur star-1.5.orig/RULES/rules.inc star-1.5/RULES/rules.inc ---- star-1.5.orig/RULES/rules.inc 2007-05-06 14:50:26.000000000 +0200 -+++ star-1.5/RULES/rules.inc 2008-04-28 14:01:23.000000000 +0200 -@@ -44,7 +44,7 @@ - $(LDCC) $(_LD_OUTPUT_OPTION) $(POFILES) $(LDFLAGS) $(LDLIBS) - - $(PTARGET): $(OINCSDIR) $(PTARGETCX) -- @echo " ==> GENERATING include file \"$@\""; $(PTARGETC)$(_XEXEEXT) > $@ -+ @echo " ==> GENERATING include file \"$@\""; $(PTARGETC) > $@ - - ########################################################################### - include $(SRCROOT)/$(RULESDIR)/sub.htm -diff -Naur star-1.5.orig/RULES/rules.prg star-1.5/RULES/rules.prg ---- star-1.5.orig/RULES/rules.prg 2006-07-07 11:42:38.000000000 +0200 -+++ star-1.5/RULES/rules.prg 2008-04-28 13:54:36.000000000 +0200 -@@ -89,7 +89,7 @@ - #LEX= @echo " ==> LEXING \"$@\""; lex - #AWK= @echo " ==> AWKING \"$@\""; awk - RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; makedepend -+MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; gccmakedep - MKDEP_OUT= -f - - MKDIR= @echo " ==> MAKING DIRECTORY \"$@\""; $(UMASK); mkdir - MKDIR_SH= @echo " ==> MAKING DIRECTORY \"$@\""; $(UMASK); sh $(SRCROOT)/conf/mkdir-sh ++++++ star-lock.diff ++++++ --- /var/tmp/diff_new_pack.lCaL2Z/_old 2015-02-27 11:08:24.000000000 +0100 +++ /var/tmp/diff_new_pack.lCaL2Z/_new 2015-02-27 11:08:24.000000000 +0100 @@ -1,6 +1,8 @@ ---- star/fifo.c -+++ star/fifo.c 2009-03-10 17:52:09.292002187 +0100 -@@ -477,13 +477,42 @@ LOCAL int +Index: star/fifo.c +=================================================================== +--- star/fifo.c.orig ++++ star/fifo.c +@@ -475,13 +475,42 @@ LOCAL int swait(f) int f; { ++++++ star-no_fsync.diff ++++++ --- /var/tmp/diff_new_pack.lCaL2Z/_old 2015-02-27 11:08:24.000000000 +0100 +++ /var/tmp/diff_new_pack.lCaL2Z/_new 2015-02-27 11:08:24.000000000 +0100 @@ -1,6 +1,8 @@ ---- star-1.5/star/star.c -+++ star-1.5/star/star.c -@@ -182,7 +182,7 @@ +Index: star-1.5.3/star/star.c +=================================================================== +--- star-1.5.3.orig/star/star.c ++++ star-1.5.3/star/star.c +@@ -186,7 +186,7 @@ int verbose = 0; /* -v has been spec BOOL silent = FALSE; /* -silent no informal msg */ BOOL prblockno = FALSE; /* -block-number for all files */ BOOL no_xheader = FALSE; /* -no-xheader ignore P.2001 */ ++++++ star-selinux.patch ++++++ --- /var/tmp/diff_new_pack.lCaL2Z/_old 2015-02-27 11:08:24.000000000 +0100 +++ /var/tmp/diff_new_pack.lCaL2Z/_new 2015-02-27 11:08:24.000000000 +0100 @@ -1,8 +1,10 @@ ---- conf/configure.in -+++ conf/configure.in -@@ -530,6 +530,15 @@ - - AC_SUBST(may_linux_src_include) +diff --git a/autoconf/configure.in b/autoconf/configure.in +index fc9f880..30383e4 100644 +--- a/autoconf/configure.in ++++ b/autoconf/configure.in +@@ -906,6 +906,15 @@ LIBS="$LIBS $lib_cap" + AC_CHECK_FUNCS(cap_get_proc cap_set_proc cap_set_flag cap_clear_flag) + LIBS="$ac_save_LIBS" +AC_CHECK_HEADERS(selinux/selinux.h) +if test "$ac_cv_header_selinux_selinux_h" = yes; then @@ -13,154 +15,252 @@ + AC_CHECK_FUNCS(is_selinux_enabled) +fi + - AC_SUBST(largefile_cc_opt) - - AC_SUBST(lib_crypt) -@@ -545,5 +554,6 @@ + dnl Misc OS checks. + AC_CHECK_FILES(/dev/tty /dev/null /dev/zero) + AC_CHECK_FILES(/dev/stdin /dev/stdout /dev/stderr) +@@ -992,6 +1001,7 @@ AC_SUBST(lib_secdb) AC_SUBST(lib_gen) AC_SUBST(lib_pthread) AC_SUBST(lib_rt) +AC_SUBST(lib_selinux) - - AC_OUTPUT(rules.cnf) ---- conf/rules.cnf.in -+++ conf/rules.cnf.in -@@ -17,6 +17,7 @@ - LIB_ACL= @lib_acl@ # Full (test/set) ACL users like star - LIB_ACL_TEST= @lib_acl_test@ # Test only ACL users like libfind - LIB_ATTR = @lib_attr@ -+LIB_SELINUX = @lib_selinux@ - LIB_SECDB = @lib_secdb@ + AC_SUBST(lib_dl) + AC_SUBST(lib_dir) + AC_SUBST(lib_cap) +diff --git a/autoconf/rules.cnf.in b/autoconf/rules.cnf.in +index affcb5c..2b7bff2 100644 +--- a/autoconf/rules.cnf.in ++++ b/autoconf/rules.cnf.in +@@ -34,6 +34,7 @@ LIB_SECDB = @lib_secdb@ LIB_GEN = @lib_gen@ LIB_PTHREAD = @lib_pthread@ ---- star/Makefile -+++ star/Makefile -@@ -25,6 +25,7 @@ - CPPOPTS += -DUSE_FIND + LIB_RT = @lib_rt@ ++LIB_SELINUX = @lib_selinux@ + LIB_DL= @lib_dl@ + LIB_DIR= @lib_dir@ + LIB_CAP= @lib_cap@ +diff --git a/star/cpio.mk b/star/cpio.mk +index 37a6dd2..8bfc3bd 100644 +--- a/star/cpio.mk ++++ b/star/cpio.mk +@@ -19,6 +19,7 @@ CPPOPTS += -DUSE_FIND CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR -+CPPOPTS += -DWITH_SELINUX CPPOPTS += -DUSE_FFLAGS - CPPOPTS += -DCOPY_LINKS_DELAYED - CPPOPTS += -DSTAR_FAT -@@ -48,7 +49,7 @@ - - #LIBS= -lunos - #LIBS= -lschily -lc /usr/local/lib/gcc-gnulib --LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) -+LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SELINUX) $(LIB_SOCKET) $(LIB_INTL) - # - # Wenn -lfind, dann auch $(LIB_INTL) - # ---- star/extract.c -+++ star/extract.c -@@ -238,6 +238,16 @@ - if (prblockno) - (void) tblocks(); /* set curblockno */ ++CPPOPTS += -DWITH_SELINUX + CPPOPTS += -DSCHILY_PRINT + CFILES= cpio.c header.c cpiohdr.c xheader.c xattr.c \ + list.c extract.c create.c append.c diff.c restore.c \ +@@ -34,7 +35,7 @@ CFILES= cpio.c header.c cpiohdr.c xheader.c xattr.c \ + HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \ + movearch.h table.h props.h fifo.h diff.h \ + checkerr.h dumpdate.h bitstring.h pathname.h +-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) ++LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) $(LIB_SELINUX) + XMK_FILE= scpioman.mk + ########################################################################### +diff --git a/star/extract.c b/star/extract.c +index cf60154..98842e1 100644 +--- a/star/extract.c ++++ b/star/extract.c +@@ -256,6 +256,17 @@ extern struct WALK walkstate; + continue; + } + #endif ++ +#ifdef WITH_SELINUX -+ if (!to_stdout && selinux_enabled) { -+ if (setselinux(&finfo) == FALSE) { -+ errmsgno(EX_BAD, -+ "Can not setup security context for '%s'. Not created.\n", -+ finfo.f_name); -+ } -+ } ++ if (!to_stdout && selinux_enabled) { ++ if (setselinux(&finfo) == FALSE) { ++ errmsgno(EX_BAD, ++ "Can not setup security context for '%s'. Not created.\n", ++ finfo.f_name); ++ } ++ } +#endif + - if (is_volhdr(&finfo)) { - if (!get_volhdr(&finfo, vhname)) { - excomerrno(EX_BAD, ---- star/pax.mk -+++ star/pax.mk -@@ -18,6 +18,7 @@ - CPPOPTS += -DUSE_FIND + if (finfo.f_flags & F_BAD_META) { + if (!void_bad(&finfo)) + break; +diff --git a/star/gnutar.mk b/star/gnutar.mk +index 1a296e1..6595aa2 100644 +--- a/star/gnutar.mk ++++ b/star/gnutar.mk +@@ -19,6 +19,7 @@ CPPOPTS += -DUSE_FIND CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR + CPPOPTS += -DUSE_FFLAGS +CPPOPTS += -DWITH_SELINUX + CPPOPTS += -DSCHILY_PRINT + CFILES= gnutar.c header.c cpiohdr.c xheader.c xattr.c \ + list.c extract.c create.c append.c diff.c restore.c \ +@@ -34,7 +35,7 @@ CFILES= gnutar.c header.c cpiohdr.c xheader.c xattr.c \ + HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \ + movearch.h table.h props.h fifo.h diff.h \ + checkerr.h dumpdate.h bitstring.h pathname.h +-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) ++LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) $(LIB_SELINUX) + XMK_FILE= gnutarman.mk + + ########################################################################### +diff --git a/star/pax.mk b/star/pax.mk +index 73c6bc1..d2a52a9 100644 +--- a/star/pax.mk ++++ b/star/pax.mk +@@ -19,6 +19,7 @@ CPPOPTS += -DUSE_FIND + CPPOPTS += -DUSE_ACL + CPPOPTS += -DUSE_XATTR CPPOPTS += -DUSE_FFLAGS ++CPPOPTS += -DWITH_SELINUX CPPOPTS += -DPAX CPPOPTS += -DSCHILY_PRINT -@@ -35,7 +36,7 @@ + CFILES= pax.c header.c cpiohdr.c xheader.c xattr.c \ +@@ -35,7 +36,7 @@ CFILES= pax.c header.c cpiohdr.c xheader.c xattr.c \ HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \ movearch.h table.h props.h fifo.h diff.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_SELINUX) $(LIB_SOCKET) $(LIB_INTL) + checkerr.h dumpdate.h bitstring.h pathname.h +-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) ++LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) $(LIB_SELINUX) XMK_FILE= spaxman.mk ########################################################################### ---- star/star.c -+++ star/star.c -@@ -39,6 +39,11 @@ - #include <schily/idcache.h> - #include "fifo.h" /* Needed for #undef FIFO */ - #include "dumpdate.h" -+ +diff --git a/star/star.c b/star/star.c +index 9dfcef7..464c751 100644 +--- a/star/star.c ++++ b/star/star.c +@@ -48,6 +48,10 @@ static UConst char sccsid[] = + #include "starsubs.h" + #include "checkerr.h" + +#ifdef WITH_SELINUX +int selinux_enabled=0; +#endif + - #ifdef USE_FIND - #include <schily/walk.h> - #include <schily/find.h> -@@ -387,6 +392,11 @@ - #endif + EXPORT int main __PR((int ac, char **av)); + LOCAL void star_create __PR((int ac, char *const *av)); + LOCAL void checkdumptype __PR((GINFO *gp)); +@@ -402,6 +406,10 @@ main(ac, av) comerr("Panic cannot set back effective uid.\n"); } + my_uid = geteuid(); + +#ifdef WITH_SELINUX -+ selinux_enabled = is_selinux_enabled() > 0; ++ selinux_enabled=is_selinux_enabled()>0; +#endif -+ - my_uid = geteuid(); /* * WARNING: We now are no more able to open a new remote connection ---- star/starsubs.h -+++ star/starsubs.h -@@ -304,6 +304,11 @@ + * unless we have been called by root. +diff --git a/star/star.mk b/star/star.mk +index a6f6cff..68d3482 100644 +--- a/star/star.mk ++++ b/star/star.mk +@@ -21,6 +21,7 @@ CPPOPTS += -DUSE_XATTR + CPPOPTS += -DUSE_FFLAGS + CPPOPTS += -DCOPY_LINKS_DELAYED + 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 \ +@@ -35,7 +36,7 @@ CFILES= star.c header.c cpiohdr.c xheader.c xattr.c \ + 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) ++LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX) + XMK_FILE= Makefile.man starformatman.mk + + ########################################################################### +diff --git a/star/star_fat.mk b/star/star_fat.mk +index 1975c94..507fbee 100644 +--- a/star/star_fat.mk ++++ b/star/star_fat.mk +@@ -29,6 +29,7 @@ CPPOPTS += -DUSE_FFLAGS + CPPOPTS += -DCOPY_LINKS_DELAYED + CPPOPTS += -DSTAR_FAT + CPPOPTS += -DSCHILY_PRINT ++CPPOPTS += -DWITH_SELINUX + CFILES= star_fat.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 \ +@@ -48,7 +49,7 @@ HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \ + + #LIBS= -lunos + #LIBS= -lschily -lc /usr/local/lib/gcc-gnulib +-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) $(LIB_SELINUX) + # + # Wenn -lfind, dann auch $(LIB_INTL) + # +diff --git a/star/starsubs.h b/star/starsubs.h +index a914ade..1e2a233 100644 +--- a/star/starsubs.h ++++ b/star/starsubs.h +@@ -317,6 +317,11 @@ extern void opt_xattr __PR((void)); extern BOOL get_xattr __PR((register FINFO *info)); extern BOOL set_xattr __PR((register FINFO *info)); extern void free_xattr __PR((star_xattr_t **xattr)); -+#ifdef WITH_SELINUX ++# ifdef WITH_SELINUX +#include <selinux/selinux.h> -+extern BOOL setselinux __PR((register FINFO *info)); -+extern int selinux_enabled; -+#endif ++extern BOOL setselinux __PR((register FINFO *info)); ++extern int selinux_enabled; ++# endif #endif /* ---- star/xattr.c -+++ star/xattr.c -@@ -196,6 +196,27 @@ +diff --git a/star/suntar.mk b/star/suntar.mk +index 9b76a23..1842917 100644 +--- a/star/suntar.mk ++++ b/star/suntar.mk +@@ -19,6 +19,7 @@ CPPOPTS += -DUSE_FIND + CPPOPTS += -DUSE_ACL + CPPOPTS += -DUSE_XATTR + CPPOPTS += -DUSE_FFLAGS ++CPPOPTS += -DWITH_SELINUX + CPPOPTS += -DSCHILY_PRINT + CFILES= suntar.c header.c cpiohdr.c xheader.c xattr.c \ + list.c extract.c create.c append.c diff.c restore.c \ +@@ -34,7 +35,7 @@ CFILES= suntar.c header.c cpiohdr.c xheader.c xattr.c \ + HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \ + movearch.h table.h props.h fifo.h diff.h \ + checkerr.h dumpdate.h bitstring.h pathname.h +-LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) ++LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_CAP) $(LIB_SELINUX) + XMK_FILE= suntarman.mk + + ########################################################################### +diff --git a/star/xattr.c b/star/xattr.c +index 2e262ef..08fc42e 100644 +--- a/star/xattr.c ++++ b/star/xattr.c +@@ -198,6 +198,27 @@ fail: #endif /* USE_XATTR */ } +#ifdef WITH_SELINUX +EXPORT BOOL +setselinux(info) -+ register FINFO *info; ++ register FINFO *info; +{ +#if defined(USE_XATTR) && defined(HAVE_SETXATTR) && defined(WITH_SELINUX) -+ if (info->f_xattr) { -+ star_xattr_t *xap; -+ for (xap = info->f_xattr; xap->name != NULL; xap++) { -+ if (strcmp(xap->name, "security.selinux") == 0) { -+ if (setfscreatecon(xap->value)) { -+ return FALSE; -+ } -+ } -+ } -+ } ++ if (info->f_xattr) { ++ star_xattr_t *xap; ++ for (xap = info->f_xattr; xap->name != NULL; xap++) { ++ if (strcmp(xap->name, "security.selinux") == 0) { ++ if (setfscreatecon(xap->value)) { ++ return FALSE; ++ } ++ } ++ } ++ } +#endif /* USE_XATTR && WITH_SELINUX */ -+ return TRUE; ++ return TRUE; +} +#endif + /* ARGSUSED */ EXPORT BOOL set_xattr(info) -@@ -209,6 +230,10 @@ +@@ -211,6 +232,10 @@ set_xattr(info) return (TRUE); for (xap = info->f_xattr; xap->name != NULL; xap++) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
