diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | autodeps/osf.prov | 4 | ||||
| -rw-r--r-- | autodeps/solaris.prov | 3 | ||||
| -rw-r--r-- | autodeps/solaris.req | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | lib/verify.c | 3 | ||||
| -rwxr-xr-x | rpm.c | 2 |
7 files changed, 17 insertions, 5 deletions
@@ -29,6 +29,11 @@ - their must be a { between two % in a query format (unless %% is used) 2.5.5 -> 2.5.6: + - solaris: don't attempt static link. (Tim Mooney) + - fix: timeCheck in rpm.c should be unsigned long. (Tim Mooney) + - osf: prov searches only shared libraries. (Tim Mooney) + - solaris: set PATH in prov/req scripts. (Tim Mooney) + - fix: ignore modes on symlinks. (Tim Mooney) - sub-packages inherit RPMTAG_EPOCH (just like RPMTAG_VERSION/RELEASE). - fix off-by-1 alloca that prevented relocating /. - there must be a { between two % in a query format (unless %% is diff --git a/autodeps/osf.prov b/autodeps/osf.prov index 9e1b51b42..45a213a9d 100644 --- a/autodeps/osf.prov +++ b/autodeps/osf.prov @@ -1,7 +1,7 @@ #! /usr/bin/ksh # Original Author: Tim Mooney (mooney@plains.nodak.edu) -# $Id: osf.prov,v 1.2 1998/05/29 16:34:27 mooney Exp $ +# $Id: osf.prov,v 1.2 1998/05/29 16:34:27 mooney Exp mooney $ # # This file is distributed under the terms of the GNU Public License # @@ -58,7 +58,7 @@ PATH=/usr/bin:/usr/sbin:/sbin:/usr/ccs/bin export PATH -for f in `cat -` +for f in `cat - | xargs file | egrep 'COFF.*shared library' | cut -d: -f1` do odump -D $f 2>/dev/null | awk ' diff --git a/autodeps/solaris.prov b/autodeps/solaris.prov index d42b7c4fc..6e0fe9f1a 100644 --- a/autodeps/solaris.prov +++ b/autodeps/solaris.prov @@ -3,6 +3,9 @@ # This script reads filenames from STDIN and outputs any relevant provides # information that needs to be included in the package. +PATH=/usr/bin:/usr/ccs/bin:/usr/sbin:/sbin +export PATH + filelist=`grep "lib.*\\.so" | xargs /usr/ucb/file -L 2>/dev/null |\ grep "ELF.*dynamic lib" | cut -d: -f1 | sort -u` for I in $filelist; do diff --git a/autodeps/solaris.req b/autodeps/solaris.req index 6f8974f61..9393e2e59 100644 --- a/autodeps/solaris.req +++ b/autodeps/solaris.req @@ -2,6 +2,9 @@ # note this works for both a.out and ELF executables +PATH=/usr/bin:/usr/ccs/bin:/usr/sbin:/sbin +export PATH + ulimit -c 0 filelist=`sed "s/['\"]/\\\&/g"` diff --git a/configure.in b/configure.in index 37a7f9faf..5fe0858e7 100644 --- a/configure.in +++ b/configure.in @@ -67,7 +67,7 @@ elif test X"$CC" = Xcc ; then *-*-osf*) LDFLAGS_STATIC="-non_shared";; *-*-aix*) LDFLAGS_STATIC="";; # -Wl,-bnso doesn't seem to work... *-*-hpux*) LDFLAGS_STATIC="-Wl,-a,archive_shared";; - *-*-solaris*) LDFLAGS_STATIC="-B static";; + *-*-solaris*) LDFLAGS_STATIC="";; *-*-irix*) LDFLAGS_STATIC="";; #should be -non_shared, but can't # link because of crt1.o then. *-*-ultrix*) LDFLAGS_STATIC="";; #ultrix doesn't have shared libs. diff --git a/lib/verify.c b/lib/verify.c index ab22982a5..510f94d93 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -82,7 +82,8 @@ int rpmVerifyFile(char * prefix, Header h, int filenum, int * result, flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | RPMVERIFY_LINKTO); else if (S_ISLNK(sb.st_mode)) { - flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME); + flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | + RPMVERIFY_MODE); # if CHOWN_FOLLOWS_SYMLINK flags &= ~(RPMVERIFY_USER | RPMVERIFY_GROUP); # endif @@ -493,7 +493,7 @@ int main(int argc, char ** argv) { int gotDbpath = 0, building = 0, verifyFlags; int rmsource = 0; int checksigFlags = 0; - int timeCheck = 0; + unsigned long int timeCheck = 0L; int addSign = NEW_SIGNATURE; char buildChar = ' '; char * specFile; |