Syncing with generic.SlackBuild v0.8.5

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1298 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 60 insertions, 20 deletions

diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild
index 16a8aef8..9d941d8d 100755
--- a/app/crypt/gnupg2/gnupg2.SlackBuild
+++ b/app/crypt/gnupg2/gnupg2.SlackBuild
@@ -33,7 +33,7 @@ CWD="$(pwd)"
 SRC_NAME="gnupg"
 PKG_NAME="gnupg2"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.0.4}
+SRC_VERSION=${VERSION:=2.0.5}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1ls}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -42,8 +42,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
 PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
-CONF_OPTIONS=${CONF_OPTIONS:=--infodir=$PREFIX/info --mandir=$PREFIX/man --enable-static-rnd=linux --enable-noexecstack}
-NUMJOBS=${NUMJOBS:=-j4}
+CONF_OPTIONS=${CONF_OPTIONS:=--infodir=$PREFIX/info --mandir=$PREFIX/man --program-prefix="" --program-suffix="" --enable-static-rnd=linux --enable-noexecstack}
+NUMJOBS=${NUMJOBS:=}
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
@@ -113,6 +113,20 @@ cd "$TMP"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
 
+# Fix source files' ownership and permission
+chown -R root:root .
+find . -perm 666 -exec chmod 644 {} \;
+find . -perm 664 -exec chmod 644 {} \;
+find . -perm 600 -exec chmod 644 {} \;
+find . -perm 444 -exec chmod 644 {} \;
+find . -perm 400 -exec chmod 644 {} \;
+find . -perm 440 -exec chmod 644 {} \;
+find . -perm 777 -exec chmod 755 {} \;
+find . -perm 775 -exec chmod 755 {} \;
+find . -perm 511 -exec chmod 755 {} \;
+find . -perm 711 -exec chmod 755 {} \;
+find . -perm 555 -exec chmod 755 {} \;
+
 # Configure
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
@@ -120,7 +134,7 @@ CFLAGS="$SLKCFLAGS" \
   --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
 
 # Compile
-make "$NUMJOBS" || exit $ERROR_MAKE
+make $NUMJOBS || exit $ERROR_MAKE
 
 # Install
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
@@ -134,7 +148,7 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL
 )
 
 # Avoid overwriting share/gnupg/ files, from Slackware's gnupg package
-mv -f "$PKG/$PREFIX/share/gnupg" "$PKG/$PREFIX/share/gnupg2"
+mv -f "$PKG/$PREFIX/share/gnupg" "$PKG/$PREFIX/share/$PKG_NAME"
 
 # Install gpg2, gpgv2, gpg-agent, and gpgsm already suid root
 chmod 4755 "$PKG/$PREFIX/bin/"{gpg2,gpgv2,gpg-agent,gpgsm}
@@ -168,11 +182,37 @@ DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* THANKS TODO \
       doc/examples doc/*.png"
 mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
 cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
-( cd "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
-  ln -sf "$PREFIX/share/$PKG_NAME/FAQ" .
-  ln -sf "$PREFIX/share/$PKG_NAME/faq.html" .
+
+# Build HTML documentation
+( cd doc
+  make gnupg.html || exit $ERROR_MAKE
+  mv gnupg.html $PKG/usr/doc/$PKG_NAME-$VERSION/html
+)
+
+# Fix some filenames in the html directory
+( cd $PKG/usr/doc/$PKG_NAME-$VERSION/html
+  mv how_002dto_002dspecify_002da_002duser_002did.html howto_specify_user_id.html
+  mv gpg-1_002e4-vs_002e-1_002e9.html gpg-1.4-vs-1.9.html
+  mv gpg_002dpreset_002dpassphrase.html gpg_preset_passphrase.html
+  mv gpgsm_002dgencert_002esh.html gpgsm_gencert_sh.html
+  mv Invoking-gpg_002dpreset_002dpassphrase.html Invoking-gpg_preset_passphrase.html
+  mv Invoking-gpg_002dconnect_002dagent.html Invoking-gpg_connect_agent.html
+  mv gpg_002dconnect_002dagent.html gpg_connect_agent.html
+  mv Agent-GET_005fCONFIRMATION.html Agent-GET_CONFIRMATION.html
+  mv option-_002d_002denable_002dssh_002dsupport.html option-enable_ssh_support.html
+  mv option-_002d_002doptions.html option-options.html
+  mv Invoking-GPG_002dAGENT.html Invoking-GPG_AGENT.html
+  mv option-_002d_002dallow_002dmark_002dtrusted.html option-allow_mark_trusted.html
+  mv Controlling-gpg_002dconnect_002dagent.html Controlling-gpg_connect_agent.html
+  mv Agent-GET_005fPASSPHRASE.html Agent-GET_PASSPHRASE.html
+  mv option-_002d_002dhomedir.html option-homedir.html
+  mv PKCS_002315-Card.html PKCS-15-Card.html
 )
 
+# Move some docs from /usr/share to their proper location
+mv $PKG/$PREFIX/share/$PKG_NAME/FAQ $PKG/usr/doc/$PKG_NAME-$VERSION
+mv $PKG/$PREFIX/share/$PKG_NAME/faq.html $PKG/usr/doc/$PKG_NAME-$VERSION/html
+
 # Add package description (slack-desc)
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
@@ -184,17 +224,17 @@ cat << EODESC > "$PKG/install/slack-desc"
 # customary to leave one space after the ':'.
 
       |-----handy-ruler--------------------------------------------------------|
-gnupg2: gnupg2 (The GNU Privacy Guard v2)
-gnupg2:
-gnupg2: The GNU Privacy Guard (GnuPG) is GNU's tool for secure communication
-gnupg2: and data storage.  It can be used to encrypt data, create digital
-gnupg2: signatures, help authenticating using Secure Shell and to provide a
-gnupg2: framework for public key cryptography.  It includes an advanced key
-gnupg2: management facility and is compliant with the OpenPGP and S/MIME
-gnupg2: standards.
+gnupg2: GnuPG2 (The GNU Privacy Guard version 2.x)
 gnupg2:
-gnupg2: For more information, http://www.gnupg.org/
+gnupg2: GnuPG is GNU's tool for secure communication and data storage.  It can
+gnupg2: be used to encrypt data and to create digital signatures.  It includes
+gnupg2: an advanced key management facility and is compliant with the proposed
+gnupg2: OpenPGP Internet standard as described in RFC2440 and the S/MIME
+gnupg2: standard as described by several RFCs.
 gnupg2:
+gnupg2: GnuPG 2.0 is the stable version of GnuPG integrating support for
+gnupg2: OpenPGP and S/MIME.  It does not conflict with an installed 1.4.x
+gnupg2: OpenPGP-only version.
 EODESC
 
 # Build the package
diff --git a/app/crypt/gnupg2/slack-required b/app/crypt/gnupg2/slack-required
index 95078e30..43f9a1a1 100644
--- a/app/crypt/gnupg2/slack-required
+++ b/app/crypt/gnupg2/slack-required
@@ -1,5 +1,5 @@
 libpth >= 1.3.7
 libgpg-error >= 1.4
-libgcrypt >= 1.2.0
-libassuan >= 1.0.1
-libksba >= 1.0.0
+libgcrypt >= 1.2.2
+libassuan >= 1.0.2
+libksba >= 1.0.2