rsync: move fakeroot to TEST_REQUIRED_PACKAGES

Marcel Telka

2024-02-05 6d2295786079f61a2c6b71640757c2c023348c58

rsync: move fakeroot to TEST_REQUIRED_PACKAGES

 components/network/rsync/Makefile

@@ -25,12 +25,11 @@
# Copyright (c) 2020, 2022, Andreas Wacknitz
#

BUILD_BITS=            64
#USE_OPENSSL11=        yes
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        rsync
COMPONENT_VERSION=    3.2.7
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    Utility that provides fast incremental file transfer and copy
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL=    https://rsync.samba.org/
@@ -39,12 +38,10 @@
COMPONENT_ARCHIVE_URL=    https://rsync.samba.org/ftp/rsync/src/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=    network/rsync
COMPONENT_CLASSIFICATION= Applications/System Utilities
COMPONENT_LICENSE=    GPLv3
COMPONENT_LICENSE=    GPL-3.0-only
COMPONENT_LICENSE_FILE=    COPYING

include $(WS_MAKE_RULES)/common.mk

CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin

CONFIGURE_OPTIONS  +=    --with-included-popt
CONFIGURE_OPTIONS  +=    --enable-xattr-support
@@ -55,7 +52,7 @@
COMPONENT_TEST_TRANSFORMS = "'/^PASS|^SKIP|^FAIL|^XFAIL/'"

# Manually added; needed during tests
REQUIRED_PACKAGES += developer/fakeroot
TEST_REQUIRED_PACKAGES += developer/fakeroot

# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs

 components/network/rsync/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2022 <contributor>
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

 components/network/rsync/patches/01-15730984.patch

@@ -3,17 +3,17 @@
The patch is needed to avoid embedding path information from the build area
in the compiled binares (in particular in error messages).

--- rsync-3.1.0/t_stub.c.orig    Tue Jun 11 18:06:53 2013
+++ rsync-3.1.0/t_stub.c    Mon Mar 17 14:58:24 2014
--- rsync-3.2.7/t_stub.c.orig
+++ rsync-3.2.7/t_stub.c
@@ -20,6 +20,7 @@
  */
 
 #include "rsync.h"
+#include <libgen.h>
 
 int modify_window = 0;
 int preallocate_files = 0;
@@ -56,7 +57,7 @@
 int do_fsync = 0;
 int inplace = 0;
@@ -60,7 +61,7 @@
  void _exit_cleanup(int code, const char *file, int line)
 {
     fprintf(stderr, "exit(%d): %s(%d)\n",
@@ -22,8 +22,8 @@
     exit(code);
 }
 
--- rsync-3.1.0/log.c.orig    Tue Jun 11 13:36:44 2013
+++ rsync-3.1.0/log.c    Mon Mar 17 14:58:51 2014
--- rsync-3.2.7/log.c.orig
+++ rsync-3.2.7/log.c
@@ -22,6 +22,7 @@
 #include "rsync.h"
 #include "itypes.h"
@@ -32,14 +32,13 @@
 
 extern int dry_run;
 extern int am_daemon;
--- rsync-3.2.2/cleanup.c.orig    2020-06-28 08:14:35.000000000 +0000
+++ rsync-3.2.2/cleanup.c    2020-07-23 18:13:38.184898463 +0000
--- rsync-3.2.7/cleanup.c.orig
+++ rsync-3.2.7/cleanup.c
@@ -21,6 +21,7 @@
  */

 
 #include "rsync.h"
+#include <libgen.h>

 
 extern int dry_run;
 extern int am_server;
 

 components/network/rsync/patches/08-getpassphrase.patch

@@ -1,6 +1,6 @@
--- rsync-3.2.2/authenticate.c.orig    2020-06-26 05:54:21.000000000 +0000
+++ rsync-3.2.2/authenticate.c    2020-07-23 16:48:29.526004411 +0000
@@ -362,7 +362,11 @@
--- rsync-3.2.7/authenticate.c.orig
+++ rsync-3.2.7/authenticate.c
@@ -365,7 +365,11 @@
          *
          * OpenBSD has a readpassphrase() that might be more suitable.
          */

 components/network/rsync/pkg5

@@ -2,14 +2,12 @@
    "dependencies": [
        "SUNWcs",
        "compress/zstd",
        "developer/fakeroot",
        "library/lz4",
        "library/security/openssl",
        "shell/ksh93",
        "system/library"
    ],
    "fmris": [
        "network/rsync"
    ],
    "name": "rsync"
}
}

 components/network/rsync/rsync.p5m

@@ -23,8 +23,6 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>

dir path=var/rsyncd/data
dir path=var/rsyncd/logs


 components/network/rsync/test/results-all.master

@@ -41,5 +41,5 @@
PASS    unsafe-byname
PASS    unsafe-links
PASS    wildmatch
FAIL    xattrs-hlink
FAIL    xattrs
PASS    xattrs-hlink
PASS    xattrs