[packages/star] Up to 1.6
arekm
arekm at pld-linux.org
Mon Mar 9 20:28:12 CET 2026
commit a3365f94c750fd270ed72a53c7aa6d4b71d3e83d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Mar 9 20:27:57 2026 +0100
Up to 1.6
star-ac26.patch | 49 +++--
star-modern.patch | 573 +++++++++++++++++++++++++++++++++++++++++++++++++++++
star-selinux.patch | 227 ---------------------
star-strtod.patch | 6 +-
star.spec | 22 +-
5 files changed, 612 insertions(+), 265 deletions(-)
---
diff --git a/star.spec b/star.spec
index 60120d2..554a508 100644
--- a/star.spec
+++ b/star.spec
@@ -1,21 +1,20 @@
#
# Conditional build:
-%bcond_without selinux # disable SELinux support
+%bcond_without selinux # SELinux support
#
Summary: A very fast, POSIX compliant tape archiver
Summary(pl.UTF-8): Szybki, zgodny z POSIX program do archiwizacji
Name: star
-Version: 1.5.2
+Version: 1.6
Release: 1
License: CDDL v1.0
Group: Applications/File
-Source0: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
-# Source0-md5: 5c15cedb52e26b02b95c82de08c5fcc1
-# based on http://www.nsa.gov/selinux/patches/star-selinux.patch.gz
-Patch0: %{name}-selinux.patch
-Patch1: %{name}-ac26.patch
-Patch2: %{name}-strtod.patch
-URL: http://cdrecord.berlios.de/old/private/star.html
+Source0: https://downloads.sourceforge.net/s-tar/%{name}-%{version}.tar.bz2
+# Source0-md5: caa1e4d18659743154822e8607fe3ae9
+Patch0: %{name}-ac26.patch
+Patch1: %{name}-strtod.patch
+Patch2: %{name}-modern.patch
+URL: https://sourceforge.net/projects/s-tar/
BuildRequires: acl-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -64,7 +63,7 @@ na dostęp klientem rmt z dowolnego systemu operacyjnego.
%prep
%setup -q
-%{?with_selinux:%patch0 -p1}
+%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
@@ -75,6 +74,7 @@ na dostęp klientem rmt z dowolnego systemu operacyjnego.
%build
cd autoconf
+export ac_cv_header_selinux_selinux_h=%{?with_selinux:yes}%{!?with_selinux:no}
./autoconf
cd ..
%{__make} \
@@ -102,6 +102,7 @@ install star/star.dfl $RPM_BUILD_ROOT%{_sysconfdir}/default/star
%{__rm} -r $RPM_BUILD_ROOT{%{_includedir},%{_prefix}/lib,%{_datadir}/doc}
%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/{man3,man5/make*.5*}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/ustar.1
echo '.so star.1' > $RPM_BUILD_ROOT%{_mandir}/man1/ustar.1
%clean
@@ -128,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/scpio.1*
%{_mandir}/man1/spax.1*
%{_mandir}/man1/star.1*
+%{_mandir}/man1/star_sym.1*
%{_mandir}/man1/suntar.1*
%{_mandir}/man1/tartest.1*
%{_mandir}/man1/ustar.1*
diff --git a/star-ac26.patch b/star-ac26.patch
index 44792b3..b517be8 100644
--- a/star-ac26.patch
+++ b/star-ac26.patch
@@ -1,38 +1,37 @@
-diff -ur star-1.5/autoconf/rules.cnf.in star-1.5-ac/autoconf/rules.cnf.in
---- star-1.5/autoconf/rules.cnf.in 2008-05-14 11:20:38.000000000 +0200
-+++ star-1.5-ac/autoconf/rules.cnf.in 2008-05-14 11:21:46.000000000 +0200
-@@ -1,7 +1,6 @@
- # @(#)rules.cnf.in 1.17 08/02/20 Copyright 1998-2007 J. Schilling
-
+--- star-1.6/star-1.6/autoconf/rules.cnf.in.orig 2018-08-15 20:50:28.000000000 +0200
++++ star-1.6/autoconf/rules.cnf.in 2026-03-09 17:35:56.962247187 +0100
+@@ -9,7 +9,6 @@
EXEEXT= @EXEEXT@
+
+ # If non-empty, prog.exec needs to be called so
-XEXEEXT= @XEXEEXT@
- OBJEXT= @OBJEXT@
- LARGEFILE_CC_OPT= @largefile_cc_opt@
-diff -ur star-1.5/RULES/rules.cmd star-1.5-ac/RULES/rules.cmd
---- star-1.5/RULES/rules.cmd 2007-05-06 14:50:26.000000000 +0200
-+++ star-1.5-ac/RULES/rules.cmd 2008-05-14 11:23:01.000000000 +0200
-@@ -19,7 +19,6 @@
+ # Object extension, .o on UNIX, .obj on DOS
+ OBJEXT= @OBJEXT@
+--- star-1.6/star-1.6/RULES/rules.cmd.orig 2018-08-14 21:07:54.000000000 +0200
++++ star-1.6/RULES/rules.cmd 2026-03-09 17:35:56.964075971 +0100
+@@ -21,7 +21,6 @@
# file and include the License file CDDL.Schily.txt from this distribution.
###########################################################################
_EXEEXT= $(EXEEXT)
-_XEXEEXT= $(XEXEEXT)
###########################################################################
- include $(SRCROOT)/$(RULESDIR)/rules.obj
- include $(SRCROOT)/$(RULESDIR)/rules.dyn
---- star-1.5.2/RULES/rules.inc.orig 2011-07-16 17:02:16.000000000 +0200
-+++ star-1.5.2/RULES/rules.inc 2013-01-12 15:06:31.957140996 +0100
-@@ -19,7 +19,6 @@
- # file and include the License file CDDL.Schily.txt from this distribution.
- ###########################################################################
- #_EXEEXT= $(EXEEXT) # Do not install as xxx.h.exe
--_XEXEEXT= $(XEXEEXT)
- ###########################################################################
- include $(SRCROOT)/$(RULESDIR)/rules.obj
+ INSFLAGS += $(STRIPFLAGS)
###########################################################################
-@@ -48,8 +47,8 @@
+--- star-1.6/star-1.6/RULES/rules.inc.orig 2026-03-09 17:32:40.749462308 +0100
++++ star-1.6/RULES/rules.inc 2026-03-09 17:35:56.965918862 +0100
+@@ -44,7 +44,7 @@
+ $(PTARGETCX): $(OFILES) $(SRCLIBS)
+ $(LDCC) $(_LD_OUTPUT_OPTION) $(POFILES) $(LDFLAGS) $(LDLIBS)
+ #
+-# If calling "$(PTARGETC)$(_XEXEEXT)" fails, this may be a cross compilation,
++# If calling "$(PTARGETC)$(_EXEEXT)" fails, this may be a cross compilation,
+ # so retry to run the command under control of "$(CONFIG_RMTCALL)".
+ #
+ # We previously had;
+@@ -56,8 +56,8 @@
#
- $(PTARGET): $(OINCSDIR) $(PTARGETCX)
+ $(PTARGET): $(PTARGETCX)
@echo " ==> GENERATING include file \"$@\""; \
- $(PTARGETC)$(_XEXEEXT) > $@ || \
- $(CONFIG_RMTCALL) $(PTARGETC)$(_XEXEEXT) > $@
diff --git a/star-modern.patch b/star-modern.patch
new file mode 100644
index 0000000..c3b91bf
--- /dev/null
+++ b/star-modern.patch
@@ -0,0 +1,573 @@
+diff -ur star-1.6.orig/autoconf/acgeneral.m4 star-1.6/autoconf/acgeneral.m4
+--- star-1.6.orig/autoconf/acgeneral.m4 2016-03-22 23:26:24.000000000 +0100
++++ star-1.6/autoconf/acgeneral.m4 2026-03-09 20:01:49.924380232 +0100
+@@ -1673,7 +1673,7 @@
+ AC_CACHE_VAL(AC_CV_NAME,
+ [ac_save_LIBS="$LIBS"
+ LIBS="-l[]AC_LIB_NAME[] $4 $LIBS"
+-AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)
++AC_TRY_LINK( , [int main()], AC_CV_NAME=yes, AC_CV_NAME=no)
+ LIBS="$ac_save_LIBS"
+ ])dnl
+ AC_MSG_RESULT($AC_CV_NAME)
+@@ -2108,7 +2108,7 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+-main()
++int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+diff -ur star-1.6.orig/autoconf/aclocal.m4 star-1.6/autoconf/aclocal.m4
+--- star-1.6.orig/autoconf/aclocal.m4 2018-08-08 00:51:17.000000000 +0200
++++ star-1.6/autoconf/aclocal.m4 2026-03-09 20:01:49.925120169 +0100
+@@ -1194,7 +1194,7 @@
+ extern long timezone;
+
+ int
+-main()
++int main()
+ {
+ exit(timezone != 0);
+ }],
+@@ -1212,7 +1212,7 @@
+ extern char *__progname;
+
+ int
+-main()
++int main()
+ {
+ exit (!(__progname != 0 && *__progname != '\0'));
+ }],
+@@ -1230,7 +1230,7 @@
+ extern char *__progname_full;
+
+ int
+-main()
++int main()
+ {
+ exit (!(__progname_full != 0 && *__progname_full != '\0'));
+ }],
+@@ -1386,7 +1386,7 @@
+ # include <time.h>
+ #endif
+ #endif
+-main()
++int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+@@ -1410,7 +1410,7 @@
+ AC_MSG_CHECKING(size of wchar)
+ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
+-main()
++int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+@@ -1443,7 +1443,7 @@
+ #ifdef HAVE_WCHAR_H
+ #include <wchar.h>
+ #endif
+-main()
++int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+@@ -1626,7 +1626,7 @@
+ unsigned char x2:4;
+ } a;
+ int
+-main()
++int main()
+ {
+ char *cp;
+
+@@ -1688,7 +1688,7 @@
+ [AC_CACHE_CHECK([if char is unsigned], ac_cv_type_char_unsigned,
+ [AC_TRY_RUN([
+ int
+-main()
++int main()
+ {
+ char c;
+
+@@ -1797,7 +1797,7 @@
+ [AC_TRY_RUN([
+ extern char *__dtoa();
+ int
+-main()
++int main()
+ {
+ #ifdef HAVE_DTOA
+ int decpt, sign;
+@@ -1832,7 +1832,7 @@
+ }
+
+ int
+-main()
++int main()
+ {
+ int a, b;
+
+@@ -1859,7 +1859,7 @@
+ }
+
+ int
+-main()
++int main()
+ {
+ int a, b;
+
+@@ -1886,7 +1886,7 @@
+ }
+
+ int
+-main()
++int main()
+ {
+ char buf[32];
+
+@@ -1925,7 +1925,7 @@
+ extern int errno;
+ #endif
+
+-main()
++int main()
+ {
+ if (mlock(0, 0) < 0) {
+ if (errno == EINVAL || errno == ENOMEM ||
+@@ -1957,7 +1957,7 @@
+ #endif
+
+ int
+-main()
++int main()
+ {
+ if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) {
+ if (errno == EINVAL || errno == ENOMEM ||
+@@ -2063,7 +2063,7 @@
+ #endif
+
+ int
+-main()
++int main()
+ {
+ char *data, *data2, *data3;
+ int i, pagesize;
+@@ -2204,7 +2204,7 @@
+ }
+
+ int
+-main()
++int main()
+ {
+ char *data, *data2;
+ int i, pagesize, ps;
+@@ -2326,7 +2326,7 @@
+ }
+
+ int
+-main()
++int main()
+ {
+ char *addr;
+
+@@ -2369,7 +2369,7 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ int
+-main()
++int main()
+ {
+ int id;
+
+@@ -2393,7 +2393,7 @@
+ [AC_CACHE_CHECK([for sys_siglist], ac_cv_func_sys_siglist,
+ [AC_TRY_RUN([
+ int
+-main()
++int main()
+ { extern char *sys_siglist[];
+ if (sys_siglist[1] == 0)
+ exit(1);
+@@ -2445,7 +2445,7 @@
+ # define makedev(majo, mino) (((majo) << 8) | (mino))
+ #endif
+ int
+-main()
++int main()
+ {
+ long l = 1;
+ int i;
+@@ -2510,7 +2510,7 @@
+ # define makedev(majo, mino) (((majo) << 8) | (mino))
+ #endif
+ int
+-main()
++int main()
+ {
+ long l = 1;
+ int i;
+@@ -2560,7 +2560,7 @@
+ free(p) char *p;{}
+ #endif /* !defined(__CYGWIN32__) && !defined(__CYGWIN__) */
+
+-main()
++int main()
+ {
+ #if !defined(__CYGWIN32__) && !defined(__CYGWIN__)
+ #ifdef HAVE_STRDUP
+@@ -2630,7 +2630,7 @@
+ [AC_CACHE_CHECK([for BSD compliant getpgrp], ac_cv_func_bsd_getpgrp,
+ [AC_TRY_RUN([
+ int
+-main()
++int main()
+ { long p;
+ /*
+ * POSIX getpgrp() has void parameter...
+@@ -2656,7 +2656,7 @@
+ extern int errno;
+ #endif
+ int
+-main()
++int main()
+ { errno = 0;
+ /*
+ * Force illegal pid on BSD
+@@ -2677,7 +2677,7 @@
+ [AC_TRY_RUN([
+ #include <inttypes.h>
+ int
+-main()
++int main()
+ { intmax_t m = 123456789012LL;
+ char buf[32];
+ sprintf(buf, "%jd", m);
+@@ -2697,7 +2697,7 @@
+ [AC_TRY_RUN([
+ #include <sys/types.h>
+ int
+-main()
++int main()
+ { size_t m = 1234567890;
+ char buf[32];
+ sprintf(buf, "%zd", m);
+@@ -2716,7 +2716,7 @@
+ [AC_CACHE_CHECK([whether *printf() supports %lld], ac_cv_func_printf_ll,
+ [AC_TRY_RUN([
+ int
+-main()
++int main()
+ { long long ll = 123456789012LL;
+ char buf[32];
+ sprintf(buf, "%lld", ll);
+@@ -2864,7 +2864,7 @@
+ AC_DEFUN([AC_HARD_SYMLINKS],
+ [AC_CACHE_CHECK([if link() allows hard links on symlinks], ac_cv_hard_symlinks,
+ [AC_TRY_RUN([
+-main()
++int main()
+ {
+ int ret = 0;
+
+@@ -2897,7 +2897,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+-main()
++int main()
+ {
+ int ret = 0;
+ int f;
+@@ -2964,7 +2964,7 @@
+ extern int errno;
+ #endif
+
+-main()
++int main()
+ {
+ #ifdef _MSC_VER
+ /*
+@@ -3008,7 +3008,7 @@
+ #endif
+ #endif
+
+-main()
++int main()
+ {
+ int ret;
+
+@@ -3042,7 +3042,7 @@
+ exit(1);
+ }
+ int
+-main()
++int main()
+ {
+ char *p;
+
+@@ -3089,7 +3089,7 @@
+ */
+
+ int
+-main()
++int main()
+ {
+ siginfo_t si;
+ pid_t pid;
+@@ -3149,7 +3149,7 @@
+ #endif
+
+ int
+-main()
++int main()
+ {
+ int xstat;
+ pid_t pid = -1;
+@@ -3482,7 +3482,7 @@
+ #include <sys/stat.h>
+
+ int
+-main()
++int main()
+ {
+ struct stat sb;
+
+diff -ur star-1.6.orig/autoconf/acspecific.m4 star-1.6/autoconf/acspecific.m4
+--- star-1.6.orig/autoconf/acspecific.m4 2019-03-14 01:15:19.000000000 +0100
++++ star-1.6/autoconf/acspecific.m4 2026-03-09 20:01:49.925957241 +0100
+@@ -204,7 +204,7 @@
+ [AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_C
+-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
++AC_TRY_COMPILER([int main() {return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_prog_cc_works)
+ if test $ac_cv_prog_cc_works = no; then
+@@ -233,7 +233,7 @@
+ [AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+-AC_TRY_COMPILER([int main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
++AC_TRY_COMPILER([int main() {return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_prog_cxx_works)
+ if test $ac_cv_prog_cxx_works = no; then
+@@ -755,7 +755,7 @@
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int main () { int i; for (i = 0; i < 256; i++)
++int main() { int i; for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+ exit (0); }
+ ], , ac_cv_header_stdc=no, :)
+@@ -872,7 +872,7 @@
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
+ #include <$ac_header_dirent>
+-int closedir(); main() { exit(closedir(opendir(".")) != 0); }],
++int closedir(); int main() { exit(closedir(opendir(".")) != 0); }],
+ ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)])
+ if test $ac_cv_func_closedir_void = yes; then
+ AC_DEFINE(VOID_CLOSEDIR)
+@@ -963,7 +963,7 @@
+ #define NGID 256
+ #undef MAX
+ #define MAX(x, y) ((x) > (y) ? (x) : (y))
+-main()
++int main()
+ {
+ gid_t gidset[NGID];
+ int i, n;
+@@ -1022,13 +1022,8 @@
+ #ifdef signal
+ #undef signal
+ #endif
+-#ifdef __cplusplus
+-extern "C" void (*signal (int, void (*)(int)))(int);
+-#else
+-void (*signal ()) ();
+-#endif
+ ],
+-[int i;], ac_cv_type_signal=void, ac_cv_type_signal=int)])
++[void (*h)(int); h = signal(SIGINT, SIG_DFL);], ac_cv_type_signal=void, ac_cv_type_signal=int)])
+ AC_DEFINE_UNQUOTED(RETSIGTYPE, $ac_cv_type_signal)
+ ])
+
+@@ -1041,7 +1036,7 @@
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
+ #include <$ac_header_dirent>
+-int closedir(); main() { exit(closedir(opendir(".")) != 0); }],
++int closedir(); int main() { exit(closedir(opendir(".")) != 0); }],
+ ac_cv_func_closedir_void=no, ac_cv_func_closedir_void=yes, ac_cv_func_closedir_void=yes)])
+ if test $ac_cv_func_closedir_void = yes; then
+ AC_DEFINE(CLOSEDIR_VOID)
+@@ -1053,7 +1048,7 @@
+ # Some versions of Solaris or SCO have a broken fnmatch function.
+ # So we run a test program. If we are cross-compiling, take no chance.
+ # Thanks to John Oleynick and Franc,ois Pinard for this test.
+-[AC_TRY_RUN([main() { exit (fnmatch ("a*", "abc", 0) != 0); }],
++[AC_TRY_RUN([int main() { exit (fnmatch ("a*", "abc", 0) != 0); }],
+ ac_cv_func_fnmatch_works=yes, ac_cv_func_fnmatch_works=no,
+ ac_cv_func_fnmatch_works=no)])
+ if test $ac_cv_func_fnmatch_works = yes; then
+@@ -1139,7 +1134,7 @@
+ #endif
+
+ int
+-main()
++int main()
+ {
+ char *data, *data2, *data3;
+ int i, pagesize;
+@@ -1224,7 +1219,7 @@
+ int pg1, pg2, pg3, pg4;
+ int ng, np, s, child;
+
+-main()
++int main()
+ {
+ pid = getpid();
+ pg1 = getpgrp(0);
+@@ -1280,7 +1275,7 @@
+ * If this system has a BSD-style setpgrp, which takes arguments, exit
+ * successfully.
+ */
+-main()
++int main()
+ {
+ if (setpgrp(1,1) == -1)
+ exit(0);
+@@ -1358,7 +1353,7 @@
+ int data = 0;
+
+ int
+-main() {
++int main() {
+ pid_t parent = getpid ();
+ pid_t child;
+
+@@ -1457,7 +1452,7 @@
+ #include <sys/resource.h>
+ #include <stdio.h>
+ /* HP-UX has wait3 but does not fill in rusage at all. */
+-main() {
++int main() {
+ struct rusage r;
+ int i;
+ /* Use a field that we can force nonzero --
+@@ -1683,7 +1678,7 @@
+ # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong.
+ AC_TRY_RUN([#include <sys/types.h>
+ #include <sys/stat.h>
+-main() {
++int main() {
+ struct stat s, t;
+ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
+ && stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime
+@@ -1716,7 +1711,7 @@
+ ac_cv_func_setvbuf_reversed,
+ [AC_TRY_RUN([#include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+-main () {
++int main() {
+ /* This call has the arguments reversed.
+ A reversed system may check and see that the address of main
+ is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */
+@@ -1748,7 +1743,7 @@
+ AC_DEFUN(AC_FUNC_MEMCMP,
+ [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
+ [AC_TRY_RUN([
+-main()
++int main()
+ {
+ char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+ exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+@@ -1906,7 +1901,7 @@
+ #if !defined(__STDC__) || __STDC__ != 1
+ #define volatile
+ #endif
+-main() {
++int main() {
+ volatile char c = 255; exit(c < 0);
+ }], ac_cv_c_char_unsigned=yes, ac_cv_c_char_unsigned=no)
+ fi])
+@@ -1935,7 +1930,7 @@
+ AC_DEFUN(AC_INT_16_BITS,
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl
+ AC_MSG_CHECKING(whether int is 16 bits)
+-AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
++AC_TRY_RUN([int main() { exit(sizeof(int) != 2); }],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
+ ])
+@@ -1943,7 +1938,7 @@
+ AC_DEFUN(AC_LONG_64_BITS,
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl
+ AC_MSG_CHECKING(whether long int is 64 bits)
+-AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }],
++AC_TRY_RUN([int main() { exit(sizeof(long int) != 8); }],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
+ ])
+@@ -1963,7 +1958,7 @@
+ not big endian
+ #endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
+ if test $ac_cv_c_bigendian = unknown; then
+-AC_TRY_RUN([main () {
++AC_TRY_RUN([int main() {
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+@@ -2384,7 +2379,7 @@
+ #include <sys/types.h>
+ #include <signal.h>
+ ucatch (isig) { }
+-main () {
++int main() {
+ int i = fork (), status;
+ if (i == 0) { sleep (3); kill (getppid (), SIGINT); sleep (3); exit (0); }
+ signal (SIGINT, ucatch);
+@@ -2784,7 +2779,7 @@
+ ac_cv_xexeext=""
+ else
+ rm -rf conftest*
+- echo 'int main () { return 0; }' > conftest.$ac_ext
++ echo 'int main() { return 0; }' > conftest.$ac_ext
+ ac_cv_exeext=
+ if AC_TRY_EVAL(ac_link); then
+ for file in conftest.*; do
+diff -ur star-1.6.orig/star/buffer.c star-1.6/star/buffer.c
+--- star-1.6.orig/star/buffer.c 2019-03-26 20:47:23.000000000 +0100
++++ star-1.6/star/buffer.c 2026-03-09 20:01:19.789762637 +0100
+@@ -1913,8 +1913,12 @@
+ {
+ prstats();
+ checkerrs();
++ #ifdef FIFO
++ #ifdef FIFO
+ if (use_fifo)
+ fifo_exit(ret);
++#endif
++#endif
+ exit(ret);
+ }
+
+diff -ur star-1.6.orig/star/fifo.h star-1.6/star/fifo.h
+--- star-1.6.orig/star/fifo.h 2018-10-22 23:43:59.000000000 +0200
++++ star-1.6/star/fifo.h 2026-03-09 20:01:19.753004379 +0100
+@@ -21,6 +21,7 @@
+
+ #ifndef _FIFO_H
+ #define _FIFO_H
++extern BOOL use_fifo;
+
+ #ifndef _SCHILY_MCONFIG_H
+ #include <schily/mconfig.h>
diff --git a/star-selinux.patch b/star-selinux.patch
deleted file mode 100644
index 74f5f4c..0000000
--- a/star-selinux.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- star-1.5/star/star.c.selinux 2003-09-10 10:26:35.000000000 -0400
-+++ star-1.5/star/star.c 2003-09-16 15:53:48.000000000 -0400
-@@ -41,6 +41,10 @@
- #include "fifo.h"
- #include "dumpdate.h"
-
-+#ifdef WITH_SELINUX
-+int selinux_enabled=0;
-+#endif
-+
- EXPORT int main __PR((int ac, char **av));
- EXPORT void copy_create __PR((int ac, char *const *av));
- LOCAL int getfilecount __PR((int ac, char *const *av, const char *fmt));
-@@ -294,6 +298,9 @@
- #endif
- comerr("Panic cannot set back effective uid.\n");
- }
-+#ifdef WITH_SELINUX
-+ selinux_enabled=is_selinux_enabled()>0;
-+#endif
- /*
- * WARNING: We now are no more able to open a new remote connection
- * unless we have been called by root.
---- star-1.5/star/Makefile.orig Fri Nov 7 23:29:38 2003
-+++ star-1.5/star/Makefile Fri Feb 27 15:57:21 2004
-@@ -16,6 +16,7 @@
- CPPOPTS += -DUSE_LARGEFILES
- CPPOPTS += -DUSE_ACL
- CPPOPTS += -DUSE_XATTR
-+CPPOPTS += -DWITH_SELINUX
- CPPOPTS += -DUSE_FFLAGS
- CFILES= star.c header.c cpiohdr.c xheader.c xattr.c \
- list.c extract.c create.c append.c diff.c restore.c \
-@@ -33,7 +34,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-1.5/star/starsubs.h.selinux 2003-09-10 11:24:04.000000000 -0400
-+++ star-1.5/star/starsubs.h 2003-09-16 15:53:48.000000000 -0400
-@@ -227,6 +227,11 @@
- 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
-+#include <selinux/selinux.h>
-+extern BOOL setselinux __PR((register FINFO *info));
-+extern int selinux_enabled;
-+#endif
- #endif
-
- /*
---- star-1.5/star/extract.c.selinux 2003-09-16 15:53:48.000000000 -0400
-+++ star-1.5/star/extract.c 2003-09-16 15:53:48.000000000 -0400
-@@ -134,6 +134,15 @@
- if (prblockno)
- (void) tblocks(); /* set curblockno */
-
-+#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);
-+ }
-+ }
-+#endif
- if (is_volhdr(&finfo)) {
- if (!get_volhdr(&finfo, vhname)) {
- excomerrno(EX_BAD,
---- star-1.5/star/pax.mk.selinux 2003-09-13 08:51:39.000000000 -0400
-+++ star-1.5/star/pax.mk 2003-09-16 16:02:34.000000000 -0400
-@@ -15,6 +15,7 @@
- CPPOPTS += -DUSE_LARGEFILES
- CPPOPTS += -DUSE_ACL
- CPPOPTS += -DUSE_XATTR
-+CPPOPTS += -DWITH_SELINUX
- CPPOPTS += -DUSE_FFLAGS
- CPPOPTS += -DPAX
- CFILES= pax.c header.c cpiohdr.c xheader.c xattr.c \
-@@ -33,7 +34,7 @@
- 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)
- XMK_FILE= spaxman.mk
-
- ###########################################################################
---- star-1.5/autoconf/configure.in.selinux 2003-09-13 12:50:23.000000000 -0400
-+++ star-1.5/autoconf/configure.in 2003-09-16 15:53:48.000000000 -0400
-@@ -313,6 +313,15 @@
- LIBS="$ac_save_LIBS"
- fi
-
-+ AC_CHECK_HEADERS(selinux/selinux.h)
-+ if test "$ac_cv_header_selinux_selinux_h" = yes; then
-+ AC_CHECKING(for SELinux support)
-+ AC_CHECK_LIB(selinux, is_selinux_enabled, lib_selinux="-lselinux -lattr")
-+ ac_save_LIBS="$LIBS"
-+ LIBS="$LIBS $lib_selinux"
-+ AC_CHECK_FUNCS(is_selinux_enabled)
-+ fi
-+
- AC_SUBST(largefile_cc_opt)
-
- AC_SUBST(lib_crypt)
-@@ -320,5 +329,6 @@
- AC_SUBST(lib_acl)
- AC_SUBST(lib_acl_test)
- AC_SUBST(lib_attr)
-+AC_SUBST(lib_selinux)
- AC_SUBST(lib_secdb)
- AC_SUBST(lib_gen)
- AC_SUBST(lib_pthread)
---- star-1.5/autoconf/rules.cnf.in.selinux 2003-09-13 09:06:41.000000000 -0400
-+++ star-1.5/autoconf/rules.cnf.in 2003-09-16 15:53:48.000000000 -0400
-@@ -8,6 +8,7 @@
- LIB_CRYPT= @lib_crypt@
- LIB_ACL= @lib_acl@
- LIB_ATTR = @lib_attr@
-+LIB_SELINUX = @lib_selinux@
- LIB_SECDB = @lib_secdb@
- LIB_GEN = @lib_gen@
- LIB_PTHREAD = @lib_pthread@
---- star-1.5/star/xattr.c.orig 2004-09-25 14:14:49.000000000 +0200
-+++ star-1.5/star/xattr.c 2004-09-27 15:08:35.928647240 +0200
-@@ -166,6 +166,27 @@
- #endif /* USE_XATTR */
- }
-
-+#ifdef WITH_SELINUX
-+EXPORT BOOL
-+setselinux(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;
-+ }
-+ }
-+ }
-+ }
-+#endif /* USE_XATTR && WITH_SELINUX */
-+ return TRUE;
-+}
-+#endif
-+
- /* ARGSUSED */
- EXPORT BOOL
- set_xattr(info)
-@@ -178,6 +199,10 @@
- return (TRUE);
-
- for (xap = info->f_xattr; xap->name != NULL; xap++) {
-+#ifdef WITH_SELINUX
-+ if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0))
-+ continue;
-+#endif
- if (lsetxattr(info->f_name, xap->name, xap->value,
- xap->value_len, 0) != 0) {
- if (!errhidden(E_SETXATTR, info->f_name)) {
---- star-1.5/star/cpio.mk.orig 2004-09-26 16:06:41.000000000 +0200
-+++ star-1.5/star/cpio.mk 2004-09-27 15:11:22.042394112 +0200
-@@ -16,6 +16,7 @@
- CPPOPTS += -DUSE_LARGEFILES
- CPPOPTS += -DUSE_ACL
- CPPOPTS += -DUSE_XATTR
-+CPPOPTS += -DWITH_SELINUX
- CPPOPTS += -DUSE_FFLAGS
- CFILES= cpio.c header.c cpiohdr.c xheader.c xattr.c \
- list.c extract.c create.c append.c diff.c restore.c \
-@@ -33,7 +34,7 @@
- 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)
- XMK_FILE= scpioman.mk
-
- ###########################################################################
---- star-1.5/star/gnutar.mk.orig 2004-09-26 17:46:54.000000000 +0200
-+++ star-1.5/star/gnutar.mk 2004-09-27 15:13:33.538403680 +0200
-@@ -16,6 +16,7 @@
- CPPOPTS += -DUSE_LARGEFILES
- CPPOPTS += -DUSE_ACL
- CPPOPTS += -DUSE_XATTR
-+CPPOPTS += -DWITH_SELINUX
- CPPOPTS += -DUSE_FFLAGS
- CFILES= gnutar.c header.c cpiohdr.c xheader.c xattr.c \
- list.c extract.c create.c append.c diff.c restore.c \
-@@ -33,7 +34,7 @@
- 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)
- XMK_FILE= gnutarman.mk
-
- ###########################################################################
---- star-1.5/star/suntar.mk.orig 2004-09-26 18:03:22.000000000 +0200
-+++ star-1.5/star/suntar.mk 2004-09-27 15:13:34.486259584 +0200
-@@ -16,6 +16,7 @@
- CPPOPTS += -DUSE_LARGEFILES
- CPPOPTS += -DUSE_ACL
- CPPOPTS += -DUSE_XATTR
-+CPPOPTS += -DWITH_SELINUX
- CPPOPTS += -DUSE_FFLAGS
- CFILES= suntar.c header.c cpiohdr.c xheader.c xattr.c \
- list.c extract.c create.c append.c diff.c restore.c \
-@@ -33,7 +34,7 @@
- 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)
- XMK_FILE= suntarman.mk
-
- ###########################################################################
diff --git a/star-strtod.patch b/star-strtod.patch
index 35b1cb6..c733b95 100644
--- a/star-strtod.patch
+++ b/star-strtod.patch
@@ -1,6 +1,6 @@
---- star-1.5/lib/strtod.c.orig Sat Apr 20 16:06:19 2002
-+++ star-1.5/lib/strtod.c Fri Feb 27 16:34:35 2004
-@@ -604,7 +604,7 @@
+--- star-1.6/libschily/strtod.c.orig 2010-08-21 00:11:59.000000000 +0200
++++ star-1.6/libschily/strtod.c 2010-08-21 00:11:59.000000000 +0200
+@@ -609,7 +609,7 @@
if (!(x & 1)) {
k++;
x >>= 1;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/star.git/commitdiff/a3365f94c750fd270ed72a53c7aa6d4b71d3e83d
More information about the pld-cvs-commit
mailing list