# Set sources default directory
SOURCE_DIR="/var/simplepkg/sources"
+# Set SOURCE_DIR folder owner
+SOURCE_DIR_USER=""
+
+# Set SOURCE_DIR folder group
+SOURCE_DIR_GROUP=""
+
# Set color style. Possible values are: color,gray, none.
COLOR_MODE="none"
# GPG key id used for package signature, leave blank to use default key.
SIGN_PACKAGES_KEYID=""
+# Whether to use gpg-agent to sign packages
+SIGN_PACKAGES_WITH_GPG_AGENT="off"
+
#---------------------------------------------------------------------
# SIMPLARET SECTION
#---------------------------------------------------------------------
- new config parameter "TMP"
- renamed function use_svn to templates_under_svn
- simplaret:
+ - support for HTTPS
- simplaret_search_and_process_patch do not donwload a package with the same
package name twice in any case
- simplaret_set_arch: mapping non-present architectures to i486
- default configuration making createpkg repository integrated with simplaret
- new repositories
- mkbuild:
+ - code cleanup
- all previous "commit" functions and command line options changed to "submit" as they
don't really commit files into the svn repository
- function svn_mkdir moved to common.sh
- renamed all "MAKEPKG" config parameters to "PACKAGES", "MAKEPKG_REPOS" to "PACKAGES_DIR"
- new config parameters PACKAGES_REPOS_STYLE, MOVE_SLACK_REQUIRED, MKBUILDS_SVN_USER,
PACKAGES_SVN_USER, PACKAGES_SVN_GROUP, MKBUILDS_SVN_GROUP, PACKAGES_REPOS_NOARCH,
- PACKAGES_SVN, CREATEPKG_AUTHOR, SIGN_PACKAGES, SIGN_PACKAGES_USER. SIGN_PACKAGES_KEYID
+ PACKAGES_SVN, CREATEPKG_AUTHOR, SIGN_PACKAGES, SIGN_PACKAGES_USER. SIGN_PACKAGES_KEYID,
+ SIGN_PACKAGES_WITH_GPG_AGENT, SOURCE_DIR_USER, SOURCE_DIR_GROUP
- cleaner -s option output
- lspkg: fix on package search routine
- jail-commit: using unified diff
}
+function is_writable_folder {
+
+ # check if a folder is writable
+ # usage: is_writable_folder <folder>
+
+ local tmpfile folder="$1"
+
+ if mkdir -p $folder &> /dev/null && tmpfile=`mktemp $folder/is_writable_folder.XXXXXX`; then
+ rm -f $tmpfile
+ return 0
+ else
+ return 1
+ fi
+
+}
+
# -----------------------------------------------
# subversion functions
# -----------------------------------------------
MANIFEST_LINE="`head -n $MANIFEST_COUNT $CWD/Manifest | tail -n 1`"
MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+ MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
continue
fi
- echo "Checking Manifest for $MANIFEST_FILE integrity..."
+ echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
exit $ERROR_MANIFEST
+ else
+ echo "Size match."
fi
# Check source code integrity
if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
exit $ERROR_MANIFEST
+ else
+ echo "$ALGO match."
fi
done
MANIFEST_LINE="`head -n $MANIFEST_COUNT $CWD/Manifest | tail -n 1`"
MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+ MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
continue
fi
- echo "Checking Manifest for $MANIFEST_FILE integrity..."
+ echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
exit $ERROR_MANIFEST
+ else
+ echo "Size match."
fi
# Check source code integrity
if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
exit $ERROR_MANIFEST
+ else
+ echo "$ALGO match."
fi
done
MANIFEST_LINE="`head -n $MANIFEST_COUNT $CWD/Manifest | tail -n 1`"
MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+ MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
continue
fi
- echo "Checking Manifest for $MANIFEST_FILE integrity..."
+ echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
exit $ERROR_MANIFEST
+ else
+ echo "Size match."
fi
# Check source code integrity
if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
exit $ERROR_MANIFEST
+ else
+ echo "$ALGO match."
fi
done
SLACKBUILDS_SVN="`eval_parameter SLACKBUILDS_SVN http://slack.sarava.org/slackbuilds`"
SVN_USER="`eval_parameter PACKAGES_SVN_USER`"
SVN_GROUP="`eval_parameter PACKAGES_SVN_GROUP`"
+ SOURCE_DIR_USER="`eval_parameter SOURCE_DIR_USER`"
+ SOURCE_DIR_GROUP="`eval_parameter SOURCE_DIR_GROUP`"
COLOR_MODE="`eval_parameter COLOR_MODE none`"
CREATEPKG_ARCH="`eval_parameter CREATEPKG_ARCH $(default_arch)`"
SIGN_PACKAGES="`eval_boolean_parameter SIGN_PACKAGES $off`"
SIGN_PACKAGES_USER="`eval_parameter SIGN_PACKAGES_USER`"
SIGN_PACKAGES_KEYID="`eval_parameter SIGN_PACKAGES_KEYID`"
+ SIGN_PACKAGES_WITH_GPG_AGENT="`eval_boolean_parameter SIGN_PACKAGES_WITH_GPG_AGENT $off`"
if [ ! -z "$SIGN_PACKAGES_KEYID" ]; then
SIGN_PACKAGES_KEYID="`echo $SIGN_PACKAGES_KEYID | tr '[:lower:]' '[:upper:]'`"
fi
+ if [ "$SIGN_PACKAGES_WITH_GPG_AGENT" -eq $on ]; then
+ GPG_AGENT_OPTION="--use-agent"
+ else
+ GPG_AGENT_OPTION=""
+ fi
+
REMOVE_OLD_PACKAGE="`eval_boolean_parameter REMOVE_OLD_PACKAGE $off`"
MOVE_BIN_PACKAGE="`eval_boolean_parameter MOVE_BIN_PACKAGE $off`"
MOVE_SLACK_REQUIRED="`eval_boolean_parameter MOVE_SLACK_REQUIRED $off`"
# Check if package was built
handle_error $? $PACKAGE
+# Fix source folder user
+if [ ! -z "$SOURCE_DIR_USER" ]; then
+ chown -R $SOURCE_DIR_USER $SOURCE_DIR
+fi
+
+# Fix source folder group
+if [ ! -z "$SOURCE_DIR_GROUP" ]; then
+ chgrp -R $SOURCE_DIR_USER $SOURCE_DIR
+fi
+
# Get package name, arch, version and build number
PKG_NAME="`ls -1 -c $PACKAGES_DIR/$PACKAGE-*-*-*.tgz | head -n 1 | xargs basename`"
PACKAGE_NAME="`package_name $PKG_NAME`"
if [ ! -z "$SIGN_PACKAGES_USER" ]; then
tmp_sign_folder="`mktemp -d $TMP/createpkg_sign.XXXXXX`"
chown $SIGN_PACKAGES_USER $tmp_sign_folder
- su $SIGN_PACKAGES_USER -c "gpg --use-agent --armor -sb -u $SIGN_KEYID -o $tmp_sign_folder/$PKG_NAME.asc $PACKAGES_DIR/$PKG_NAME"
+ su $SIGN_PACKAGES_USER -c "gpg $GPG_AGENT_OPTION --armor -sb -u $SIGN_KEYID -o $tmp_sign_folder/$PKG_NAME.asc $PACKAGES_DIR/$PKG_NAME"
cp $tmp_sign_folder/$PKG_NAME.asc $PACKAGES_DIR/$PKG_NAME.asc
rm -rf $tmp_sign_folder
else
- gpg --use-agent --armor -sb -u $SIGN_KEYID $PACKAGES_DIR/$PKG_NAME
+ gpg $GPG_AGENT_OPTION --armor -sb -u $SIGN_KEYID $PACKAGES_DIR/$PKG_NAME
fi
fi
ACTION="commit_all"
shift
;;
+ '-um'|'--update-manifest')
+ ACTION="update_manifest"
+ MKBUILD_NAME="${2//.mkbuild}.mkbuild"
+ SOURCE_FILE="$3"
+ shift 2
+ ;;
'-n'|'--new')
# New mkbuild configure file
MKBUILD_NAME="${2//.mkbuild}.mkbuild"
local sum="" file="$1" file_type="`echo $2 | tr '[:lower:]' '[:upper:]'`"
local size algo candidate folders path manifest_file="$3"
+ local dist_name="`basename $file`"
if [ -d "$file" ]; then
return
if [ ! -e "$file" ]; then
if [ "$file_type" == "DIST" ]; then
- folders="$WORK $TMP $SOURCE_DIR"
- if ! is_the_same /tmp $TMP; then
- folders="$folders /tmp"
+ # Add DIST information only if source is not under revision control
+ if [ $SVN_MOD -eq $on -o $GIT_MOD -eq $on ]; then
+ return
fi
- echo "Trying to find $(basename $file)) at $folders..."
+ # Force DIST file name at Manifest
+ dist_name="$DIST_SRC_NAME"
- for path in $folders; do
- candidate="$(find $path -name $(basename $file))"
- if [ ! -z "$candidate" ]; then
- break
- fi
- done
+ # Determine file location
+ get_dist_file
- if [ ! -z "$candidate" ]; then
- echo "Using $(basename $file) found at $(dirname $candidate) to hash at the Manifest."
- file="$candidate"
+ # Update Manifest metadata
+ if [ -e "$DIST_SRC_LOCATION" ]; then
+ file="$DIST_SRC_LOCATION"
+ echo "Using $(basename $file) found at $(dirname $file) to hash at the Manifest."
else
- echo "$file_type `basename $file` " >> $manifest_file # end space is important
+ echo "$file_type $dist_name " >> $manifest_file # end space is important
return 1
fi
else
- echo "$file_type `basename $file` " >> $manifest_file # end space is important
+ echo "$file_type $dist_name " >> $manifest_file # end space is important
return 1
fi
fi
sum="$sum `echo $algo | tr '[:lower:]' '[:upper:]'` `gethash $algo $file`"
done
- echo $file_type `basename $file` `file_size $file` $sum >> $manifest_file
+ echo $file_type $dist_name `file_size $file` $sum >> $manifest_file
}
fi
# Update Manifest file
- if [ ! -e "`dirname $file`/Manifest" ]; then
+ if [ ! -e "$WORK/Manifest" ]; then
touch $WORK/Manifest
fi
tmpfile="`mktemp $TMP/mkbuild_manifest.XXXXXX`"
# Update metadata
- sed -e "/^$file_type `basename $file` /d" `dirname $file`/Manifest > $tmpfile
+ sed -e "/^$file_type `basename $file` /d" $WORK/Manifest > $tmpfile
file_metainfo $file $file_type $tmpfile
if [ "$?" != "0" ]; then
fi
# Save Manifest changes
- sort $tmpfile > `dirname $file`/Manifest
+ sort $tmpfile > $WORK/Manifest
rm -f $tmpfile
}
-function update_manifest {
+function edit_manifest {
# Update Manifest file
verbose "Updating Manifest..."
}
+function get_dist_file {
+
+ # get package source code
+ # usage: get_dist_file [file]
+
+ local folders path candidate file="$1"
+ local protocol="`echo $URL | cut -d : -f 1 | tr '[:upper:]' '[:lower:]'`"
+
+ # Determine file location
+ if [ -d "$file" ]; then
+
+ file="$DIST_SRC_NAME"
+ for candidate in $(find $SOURCE_FILE -name $(basename $file)); do
+ if [ ! -z "$candidate" ]; then
+ break 2
+ fi
+ done
+
+ if [ ! -z "$candidate" ]; then
+ echo "Using $(basename $candidate) found at $(dirname $candidate) to hash at the Manifest."
+ file="$candidate"
+ else
+ echo "Can't find $file at $DIST_SRC_NAME."
+ return 1
+ fi
+
+ elif [ -z "$file" ]; then
+
+ file="$DIST_SRC_NAME"
+ folders="$WORK $TMP $SOURCE_DIR"
+ if ! is_the_same /tmp $TMP; then
+ folders="$folders /tmp"
+ fi
+
+ echo "Trying to find $(basename $file) at $folders..."
+
+ for path in $folders; do
+ for candidate in $(find $path -name $(basename $file)); do
+ if [ ! -z "$candidate" ]; then
+ break 2
+ fi
+ done
+ done
+
+ if [ ! -z "$candidate" ]; then
+
+ echo "Using $(basename $candidate) found at $(dirname $candidate) to hash at the Manifest."
+ file="$candidate"
+
+ elif [ "$protocol" == "https" ] || \
+ [ "$protocol" == "http" ] || \
+ [ "$protocol" == "ftp" ]; then
+
+ # TODO: config file parameter should control whether to donwload
+ # Try to donwload the file
+ if [ ! -e "$file" ]; then
+ if is_writable_folder $SOURCE_DIR/$PKG_NAME; then
+ file="$SOURCE_DIR/$PKG_NAME/`basename $DIST_SRC_NAME`"
+ wget "$URL" -O "$file"
+ if [ "$?" != "0" ]; then
+ echo "Could not download $file"
+ return 1
+ fi
+ elif is_writable_folder $TMP; then
+ file="$TMP/`basename $DIST_SRC_NAME`"
+ if [ ! -e "$file" ]; then
+ wget "$URL" -O "$file"
+ if [ "$?" != "0" ]; then
+ echo "Could not download $file"
+ return 1
+ fi
+ fi
+ elif ! is_the_same /tmp $TMP; then
+ file="/tmp/`basename $DIST_SRC_NAME`"
+ if [ ! -e "$file" ]; then
+ wget "$URL" -O "$file"
+ if [ "$?" != "0" ]; then
+ echo "Could not download $file"
+ return 1
+ fi
+ fi
+ else
+ echo "Could not download $file"
+ return 1
+ fi
+ fi
+ fi
+ fi
+
+ DIST_SRC_LOCATION="$file"
+
+}
+
+function update_manifest {
+
+ # Get mkbuild values
+ get_mkbuild_values
+
+ # Add DIST information only if source is not under revision control
+ if [ $SVN_MOD -eq $on -o $GIT_MOD -eq $on ]; then
+ echo "Source is under version control system, can't add hashes to Manifest."
+ return
+ fi
+
+ echo "Updating DIST information at $MKBUILD_NAME Manifest..."
+
+ # Determine file location
+ get_dist_file
+
+ # Update Manifest metadata
+ if [ -e "$DIST_SRC_LOCATION" ]; then
+ update_manifest_info $DIST_SRC_LOCATION dist
+ # TODO: that should appear also when adding DIST information at edit_manifest
+ echo "Please make sure that the following hashes are correct:"
+ grep -e "^DIST $DIST_SRC_NAME " $WORK/Manifest
+ else
+ echo "Can't get $DIST_SRC_NAME."
+ fi
+
+}
+
function if_previous_error {
if [ "$?" != "0" ]; then
function verbose {
- if [ $VERBOSE -eq $on ]; then
- echo $*
- fi
+ if [ $VERBOSE -eq $on ]; then
+ echo $*
+ fi
}
-function make_slackbuild {
+function get_mkbuild_values {
# Get values
# Author name
SLACKBUILD_PATH=`get_slackbuild_path`
verbose "[[SLACKBUILD PATH]]=\"$SLACKBUILD_PATH\""
+}
+
+function make_slackbuild {
+
#--------------------------------------------------------------
#- Start build SlackBuild -
#--------------------------------------------------------------
+
+ # Get mkbuild values
+ get_mkbuild_values
+
verbose -e "\nStart SlackBuild make"
SLACKBUILD_TEMP=$SLACKBUILD.tmp
cp $MODEL_DIR/$MODEL $SLACKBUILD_TEMP
change_other_parameters
# Update Manifest file
- update_manifest
+ edit_manifest
# Commit SlackBuild
[ $SUBMIT_SLACKBUILD -eq $on ] && submit_slackbuild
verbose -e "$BASENAME version $PROG_VERSION\n"
if [ ! -z $MKBUILD_NAME ]; then
case $ACTION in
+ 'update_manifest')
+ update_manifest $*
+ ;;
'commit_slackbuild')
commit_changes $SLACKBUILDS_DIR $*
;;
local curl_timeout curl_passive_ftp curl_verbose
local ncftpget_timeout ncftpget_passive_ftp
- protocol="`echo $1 | cut -d : -f 1`"
+ protocol="`echo $1 | cut -d : -f 1 | tr '[:upper:]' '[:lower:]'`"
file="`basename $2`"
if [ ! -d "$3" ]; then
echo ""
fi
- if [ "$protocol" == "http" ]; then
+ if [ "$protocol" == "http" ] || [ "$protocol" == "https" ]; then
echo Getting $1/$2:
if [ "$HTTP_TOOL" == "wget" ]; then
projects / simplepkg.git / commitdiff