Update version and integrate setuid logic from upstream package vendor.

Wed, 21 Sep 2011 13:51:49 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 21 Sep 2011 13:51:49 +0200
changeset 373
b8e8f9dbbfd3
parent 372
442a711da911
child 374
c158bb6622e1

Update version and integrate setuid logic from upstream package vendor.

gnupg/gnupg.patch file | annotate | diff | comparison | revisions
gnupg/gnupg.spec file | annotate | diff | comparison | revisions
     1.1 --- a/gnupg/gnupg.patch	Wed Sep 21 13:46:39 2011 +0200
     1.2 +++ b/gnupg/gnupg.patch	Wed Sep 21 13:51:49 2011 +0200
     1.3 @@ -18,7 +18,7 @@
     1.4  Index: configure
     1.5  --- configure.orig	2009-09-04 18:09:14 +0200
     1.6  +++ configure	2009-09-06 23:05:29 +0200
     1.7 -@@ -7992,13 +7992,13 @@
     1.8 +@@ -7782,13 +7782,13 @@
     1.9   # Check wether it is necessary to link against libdl.
    1.10   #
    1.11   gnupg_dlopen_save_libs="$LIBS"
     2.1 --- a/gnupg/gnupg.spec	Wed Sep 21 13:46:39 2011 +0200
     2.2 +++ b/gnupg/gnupg.spec	Wed Sep 21 13:51:49 2011 +0200
     2.3 @@ -31,13 +31,14 @@
     2.4  Class:        PLUS
     2.5  Group:        PGP
     2.6  License:      GPL
     2.7 -Version:      2.0.16
     2.8 -Release:      20101026
     2.9 +Version:      2.0.17
    2.10 +Release:      20110914
    2.11  
    2.12  #   package options
    2.13  %option       with_curl  yes
    2.14  %option       with_ldap  no
    2.15  %option       with_idea  no
    2.16 +%option       with_setuid no
    2.17  
    2.18  #   list of sources
    2.19  Source0:      ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
    2.20 @@ -46,8 +47,8 @@
    2.21  #   build information
    2.22  Prefix:       %{l_prefix}
    2.23  BuildRoot:    %{l_buildroot}
    2.24 -BuildPreReq:  OpenPKG, openpkg >= 20100101, make
    2.25 -PreReq:       OpenPKG, openpkg >= 20100101, pinentry
    2.26 +BuildPreReq:  OpenPKG, openpkg >= 20060823, make
    2.27 +PreReq:       OpenPKG, openpkg >= 20060823, pinentry
    2.28  BuildPreReq:  gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
    2.29  PreReq:       gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
    2.30  BuildPreReq:  zlib, bzip2, readline, pth, libiconv
    2.31 @@ -64,6 +65,8 @@
    2.32  BuildPreReq:  gcrypt::with_idea
    2.33  PreReq:       gcrypt::with_idea
    2.34  %endif
    2.35 +AutoReq:      no
    2.36 +AutoReqProv:  no
    2.37  
    2.38  %description
    2.39      GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and
    2.40 @@ -189,9 +192,15 @@
    2.41      #   determine installation files
    2.42      %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
    2.43          %{l_files_std} \
    2.44 +%if "%{with_setuid}" == "yes"
    2.45          '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
    2.46  #        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' \
    2.47  #        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg'
    2.48 +%else
    2.49 +        '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
    2.50 +#        '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \
    2.51 +#        '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
    2.52 +%endif
    2.53  
    2.54  %files -f files
    2.55  

mercurial