diff options
| -rw-r--r-- | trunk/doc/CHANGELOG | 7 | ||||
| -rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild | 10 | ||||
| -rw-r--r-- | trunk/mkbuild/model.mkbuild | 2 | ||||
| -rwxr-xr-x | trunk/simplepkg.SlackBuild | 2 |
4 files changed, 19 insertions, 2 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 41917dd..bf91046 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -1,6 +1,13 @@ simplepkg changelog =================== +0.6pre23 +======== + + - generic.mkSlackBuild: + - new section copy_init_scripts + - gpg_signature_check: support for [[SIGNING KEY ID]] parameter + 0.6pre22 ======== diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild index 6675bd6..021374d 100644 --- a/trunk/mkbuild/generic.mkSlackBuild +++ b/trunk/mkbuild/generic.mkSlackBuild @@ -1,7 +1,7 @@ ################################################################# ## Generic template for SlackBuilds ## -## Version 0.9.7 - Luis ( luis at riseup d0t net) +## Version 0.9.8 - Luis ( luis at riseup d0t net) ## Alves ( rudsonalves at yahoo d0t com d0t br ) ################################################################# #!/bin/bash @@ -137,6 +137,8 @@ MD5SUM_URL="$(grep "$SRC[ \t]*$" "$SRC_DIR/$SRC.[[MD5SUM EXTENSION]]" | cut -d " # Import minimized signing key from if echo [[SIGNING KEY URL]] | grep -q -v "SIGNING KEY URL"; then lynx -dump [[SIGNING KEY URL]] | gpg --import || exit $ERROR_GPG +elif echo [[SIGNING KEY ID]] | grep -q -v "SIGNING KEY ID"; then + gpg --recv-keys [[SIGNING KEY ID]] || exit $ERROR_GPG else gpg --import << EOKEY || exit $ERROR_GPG [[SIGNING KEY]] @@ -270,6 +272,12 @@ if [ -d "$PKG/$PREFIX/info" ]; then fi </compress_info_files> +<copy_init_scripts> off +# Copy init scripts +mkdir -p $PKG/etc/rc.d +cp $CWD/rc.* $PKG/etc/rc.d/ +</copy_init_scripts> + <install_documentation> off # Install documentation DOCS="[[DOCUMENTATION FILES]]" diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild index 504c38d..3dd7b06 100644 --- a/trunk/mkbuild/model.mkbuild +++ b/trunk/mkbuild/model.mkbuild @@ -99,6 +99,7 @@ #[[MD5SUM EXTENSION]]="" #[[SIGNING KEY]]="" #[[SIGNING KEY URL]]="" +#[[SIGNING KEY ID]]="" #[[CONFIG FILES]]="" #[[PATCH URLS]]="" [[PATCH FILES]]="" @@ -138,6 +139,7 @@ off: patch_source on: strip_binaries off: compress_manpages off: compress_info_files +off: copy_init_scripts on: install_documentation on: slackdesc off: move_config_files diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild index f389075..453cf30 100755 --- a/trunk/simplepkg.SlackBuild +++ b/trunk/simplepkg.SlackBuild @@ -18,7 +18,7 @@ PACKAGE="simplepkg" PACK_DIR="package-$PACKAGE" BUILD=${BUILD:=1rha} -VERSION="0.6pre22" +VERSION="0.6pre23" ARCH="noarch" LIBEXEC="/usr/libexec/$PACKAGE" BINDIR="/usr/bin" |