OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Oct-2003 17:26:26
Branch: HEAD Handle: 2003102016262600
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmpopt
Log:
make 'rpm --setperms' and 'rpm --setugids' more portable by using Bash
Summary:
Revision Changes Path
1.76 +1 -0 openpkg-src/openpkg/HISTORY
1.234 +2 -1 openpkg-src/openpkg/openpkg.spec
1.9 +12 -0 openpkg-src/openpkg/rpmpopt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.75 -r1.76 HISTORY
--- openpkg-src/openpkg/HISTORY 20 Oct 2003 12:47:37 -0000 1.75
+++ openpkg-src/openpkg/HISTORY 20 Oct 2003 15:26:26 -0000 1.76
@@ -2,6 +2,7 @@
2003
====
+20031020 make "rpm --setperms" and "rpm --setugids" more portable by using Bash
20031020 finish porting to SCO UnixWare 7.1.3
20031019 port mostly to SCO UnixWare 7.1.3 (only some libtool issues remaining)
20031019 provide %{l_cppflags -i} for platform identification defines
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.233 -r1.234 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 20 Oct 2003 12:47:37 -0000 1.233
+++ openpkg-src/openpkg/openpkg.spec 20 Oct 2003 15:26:26 -0000 1.234
@@ -878,7 +878,8 @@
chmod 644 $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/platform
# install overriding RPM configuration files
- cat `SOURCE rpmpopt` \
+ sed -e "s:@l_prefix@:%{l_prefix}:g" \
+ <`SOURCE rpmpopt`
>>$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmpopt
sed -e "s:@l_prefix@:%{l_prefix}:g" \
<`SOURCE rpmrc` \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmpopt
============================================================================
$ cvs diff -u -r1.8 -r1.9 rpmpopt
--- openpkg-src/openpkg/rpmpopt 10 Oct 2003 18:42:50 -0000 1.8
+++ openpkg-src/openpkg/rpmpopt 20 Oct 2003 15:26:26 -0000 1.9
@@ -71,6 +71,18 @@
rpm alias --db-private --define "_rpmdb_private yes" \
--POPTdesc=$"operate RPM database in in Berkeley-DB DB_PRIVATE mode"
+# RPM adjustment: "rpm --setperms ..."
+rpm alias --setperms -q --qf \
+ '[\[ -L %{FILENAMES:shescape} \] || chmod %7.7{FILEMODES:octal}
%{FILENAMES:shescape}\n]' \
+ --pipe "grep -v '(none)' | sed 's/chmod .../chmod /' |
@l_prefix@/lib/openpkg/bash" \
+ --POPTdesc=$"set permissions of files in a package"
+
+# RPM adjustment: "rpm --setugids ..."
+rpm alias --setugids -q --qf \
+ '[do %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape}
%{FILENAMES:shescape}\n]' \
+ --pipe "(echo 'do () { chown -- \"$1\" \"$3\"; chgrp -- \"$2\" \"$3\"; }'; grep
-v '(none)') | @l_prefix@/lib/openpkg/bash" \
+ --POPTdesc=$"set user/group ownership of files in a package"
+
# RPM adjustment: improved and cleaned up "rpm -i/--info"
rpmq alias --info --qf '\
Name: %-25{NAME} Source RPM: %{SOURCERPM}\n\
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
