!38 upgrade version to 2.17
From: @dongyuzhen Reviewed-by: @licunlong Signed-off-by: @licunlong
This commit is contained in:
openeuler-ci-bot
Gitee
commit
64da5e37b3
@ -9,20 +9,20 @@ Subject: [PATCH] reset %defattr when users want to keep files permission, uid
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/rpmrebuild_files.sh b/rpmrebuild_files.sh
|
||||
index 30bd91d..f0798a8 100755
|
||||
index 6d0db46..fd1c75a 100755
|
||||
--- a/rpmrebuild_files.sh
|
||||
+++ b/rpmrebuild_files.sh
|
||||
@@ -69,6 +69,10 @@ if [ "X$RPMREBUILD_CAP_FROM_FS" = "Xyes" ]; then
|
||||
@@ -69,6 +69,10 @@ if [ "$RPMREBUILD_CAP_FROM_FS" = "yes" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
+if [ "X$RPMREBUILD_PUG_FROM_FS" = "Xyes" ]; then
|
||||
+if [ "$RPMREBUILD_PUG_FROM_FS" = "yes" ]; then
|
||||
+ echo "%defattr(-,-,-,-)"
|
||||
+fi
|
||||
+
|
||||
while :; do
|
||||
read file_type
|
||||
[ "x$file_type" = "x" ] && break
|
||||
[ -z "$file_type" ] && break
|
||||
--
|
||||
2.23.0
|
||||
2.33.0
|
||||
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From d0df2f1aef9784e09467a8b513fa14135a6d3928 Mon Sep 17 00:00:00 2001
|
||||
From: xujing <xujing125@huawei.com>
|
||||
Date: Tue, 8 Nov 2022 10:51:34 +0800
|
||||
Subject: [PATCH] fix --cap-from-fs does not work
|
||||
|
||||
---
|
||||
rpmrebuild_files.sh | 2 +-
|
||||
rpmrebuild_parser.src | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/rpmrebuild_files.sh b/rpmrebuild_files.sh
|
||||
index 1afc484..fb40709 100755
|
||||
--- a/rpmrebuild_files.sh
|
||||
+++ b/rpmrebuild_files.sh
|
||||
@@ -193,7 +193,7 @@ while :; do
|
||||
|
||||
# %caps handling
|
||||
if [ "X$RPMREBUILD_CAP_FROM_FS" = "Xyes" ]; then
|
||||
- file_cap=$( getcap "$file" | cut -f2 -d= )
|
||||
+ file_cap=$( getcap "$file" | cut -f2 -d' ' )
|
||||
else
|
||||
# get capability from rpm query
|
||||
[ "X$file_cap" = "X(none)" ] && file_cap=""
|
||||
diff --git a/rpmrebuild_parser.src b/rpmrebuild_parser.src
|
||||
index 2f400ac..cbdb516 100755
|
||||
--- a/rpmrebuild_parser.src
|
||||
+++ b/rpmrebuild_parser.src
|
||||
@@ -1235,6 +1235,7 @@ function CommandLineParsing
|
||||
|
||||
export RPMREBUILD_COMMENT_MISSING="no"
|
||||
export RPMREBUILD_PUG_FROM_FS="no"
|
||||
+ export RPMREBUILD_CAP_FROM_FS="no"
|
||||
export RPMREBUILD_WARNING="no"
|
||||
|
||||
PAQUET=""
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 9605c9e3d9b45b8e095f4e2915696c7c46401535 Mon Sep 17 00:00:00 2001
|
||||
From: xujing <xujing125@huawei.com>
|
||||
Date: Tue, 8 Nov 2022 10:52:14 +0800
|
||||
Subject: [PATCH] fix --comment-missing=n does not work
|
||||
|
||||
---
|
||||
rpmrebuild_parser.src | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/rpmrebuild_parser.src b/rpmrebuild_parser.src
|
||||
index cbdb516..1b1b8be 100755
|
||||
--- a/rpmrebuild_parser.src
|
||||
+++ b/rpmrebuild_parser.src
|
||||
@@ -1062,7 +1062,7 @@ function ProcessLongOptions
|
||||
;;
|
||||
|
||||
*)
|
||||
- RPMREBUILD_COMMENT_MISSING="yes"
|
||||
+ RPMREBUILD_COMMENT_MISSING="no"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -12,7 +12,7 @@ inherit permissions of tmp dir. However, --change-files only set permission.
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/rpmrebuild_buildroot.sh b/rpmrebuild_buildroot.sh
|
||||
index 4af3c0a..4014ff8 100755
|
||||
index 4996e2e..00393eb 100755
|
||||
--- a/rpmrebuild_buildroot.sh
|
||||
+++ b/rpmrebuild_buildroot.sh
|
||||
@@ -75,6 +75,8 @@ while :; do
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 5fb7daedd8ee3651f74382295e2983d5ca4707ff Mon Sep 17 00:00:00 2001
|
||||
From: xujing <xujing125@huawei.com>
|
||||
Date: Tue, 8 Nov 2022 10:53:03 +0800
|
||||
Subject: [PATCH] fix -r does not work
|
||||
|
||||
---
|
||||
rpmrebuild_parser.src | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/rpmrebuild_parser.src b/rpmrebuild_parser.src
|
||||
index 1b1b8be..e244a8d 100755
|
||||
--- a/rpmrebuild_parser.src
|
||||
+++ b/rpmrebuild_parser.src
|
||||
@@ -1243,7 +1243,7 @@ function CommandLineParsing
|
||||
|
||||
export LONG_OPTION
|
||||
|
||||
- while getopts "5a:bc:d:D:ef:hi:Iklm:npPRrs:vVwy:-:" opt; do
|
||||
+ while getopts "5a:bc:d:D:ef:hi:Iklm:npPRr:s:vVwy:-:" opt; do
|
||||
OPTIND_INCR=""
|
||||
case "$opt" in
|
||||
5) LONG_OPTION="md5-compat-digest";;
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 66600caf035017a179ddcc3bfebfc3f9887f3a79 Mon Sep 17 00:00:00 2001
|
||||
From: xujing <xujing125@huawei.com>
|
||||
Date: Tue, 8 Nov 2022 10:49:20 +0800
|
||||
Subject: [PATCH] fix spelling errors that could mislead users
|
||||
|
||||
---
|
||||
plugins/un_prelink.sh | 2 +-
|
||||
rpmrebuild_parser.src | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plugins/un_prelink.sh b/plugins/un_prelink.sh
|
||||
index 56a4350..f115b43 100755
|
||||
--- a/plugins/un_prelink.sh
|
||||
+++ b/plugins/un_prelink.sh
|
||||
@@ -60,7 +60,7 @@ fi
|
||||
case $LONG_OPTION in
|
||||
change-files)
|
||||
;;
|
||||
- *) msg "should be called from LONG_OPTION=change-file";
|
||||
+ *) msg "should be called from LONG_OPTION=change-files";
|
||||
syntaxe
|
||||
;;
|
||||
esac
|
||||
diff --git a/rpmrebuild_parser.src b/rpmrebuild_parser.src
|
||||
index eff950b..2f400ac 100755
|
||||
--- a/rpmrebuild_parser.src
|
||||
+++ b/rpmrebuild_parser.src
|
||||
@@ -31,7 +31,7 @@ options:
|
||||
-D, --define=<define> $UsageDefine
|
||||
-e, --edit-spec $UsageEditSpec
|
||||
-f, --filter=<command> $UsageFilter
|
||||
- -i, --includes=<file> $UsageInclude
|
||||
+ -i, --include=<file> $UsageInclude
|
||||
-I, --install $UsageInstall
|
||||
-k, --keep-perm $UsageKeepPerm
|
||||
--pug-from-fs $UsagePugFs
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From ae0eae172e9f6775aa231ca003346329bd4a9ef0 Mon Sep 17 00:00:00 2001
|
||||
From: dongyuzhen <dongyuzhen@h-partners.com>
|
||||
Date: Thu, 16 Jun 2022 10:53:57 +0800
|
||||
Subject: [PATCH] fix the CreateBuildRoot error when using rpmrebuild command
|
||||
|
||||
Because the rpmrebuild_buildroot.sh file writing is not standard,when
|
||||
using rpmrebuild command,the system will report CreateBuildRoot error.
|
||||
---
|
||||
rpmrebuild_buildroot.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/rpmrebuild_buildroot.sh b/rpmrebuild_buildroot.sh
|
||||
index 731a609..4af3c0a 100755
|
||||
--- a/rpmrebuild_buildroot.sh
|
||||
+++ b/rpmrebuild_buildroot.sh
|
||||
@@ -74,7 +74,7 @@ while :; do
|
||||
# result will be 4 permissions characters
|
||||
file_perm="${file_perm#${not_perm}}"
|
||||
Mkdir_p "$BuildRoot/$file" || Critical "$MY_BASENAME Mkdir_p $BuildRoot/$file"
|
||||
- chmod "$file_perm $BuildRoot/$file" || Critical "$MY_BASENAME chmod $file_perm $BuildRoot/$file"
|
||||
+ chmod "$file_perm" "$BuildRoot/$file" || Critical "$MY_BASENAME chmod $file_perm $BuildRoot/$file"
|
||||
;;
|
||||
|
||||
*)
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Binary file not shown.
BIN
rpmrebuild-2.17.tar.gz
Normal file
BIN
rpmrebuild-2.17.tar.gz
Normal file
Binary file not shown.
@ -1,18 +1,13 @@
|
||||
Name: rpmrebuild
|
||||
Version: 2.16
|
||||
Release: 9
|
||||
Version: 2.17
|
||||
Release: 1
|
||||
Summary: A tool to build a rpm file from the rpm database
|
||||
License: GPLv2+
|
||||
URL: http://rpmrebuild.sourceforge.net
|
||||
Source0: https://downloads.sourceforge.net/rpmrebuild/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch9000: bugfix-reset-defattr-when-users-want-to-keep-files-permissi.patch
|
||||
Patch9001: fix-the-CreateBuildRoot-error-when-using-rpmrebuild-command.patch
|
||||
Patch9002: fix-k-may-not-keep-uid-or-gid.patch
|
||||
Patch9003: fix-spelling-errors-that-could-mislead-users.patch
|
||||
Patch9004: fix-cap-from-fs-does-not-work.patch
|
||||
Patch9005: fix-comment-missing-n-does-not-work.patch
|
||||
Patch9006: fix-r-does-not-work.patch
|
||||
Patch9001: fix-k-may-not-keep-uid-or-gid.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
@ -64,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/fr_FR.UTF-8/man1/
|
||||
%{_mandir}/fr/man1/*.gz
|
||||
|
||||
%changelog
|
||||
* Wed Feb 1 2023 dongyuzhen <dongyuzhen@h-partners.com> - 2.17-1
|
||||
- upgrade version to 2.17
|
||||
|
||||
* Fri Nov 25 2022 dongyuzhen <dongyuzhen@h-partners.com> - 2.16-9
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user