Merge branch 'master' of git.alt:packages/etersoft-build-utils

NEWS

+etersoft-build-utils-1.7.3: 13 Jan 2010
+- rpmgp: add acl list printing
+- gpush: push without branch if --all
+- rpmbph: do not insert fix for fuzzy patch in any case
+- rpmgp: add -g option for remote and locally repo clone
+
+etersoft-build-utils-1.7.2: 09 Jan 2010
+- rpmbph: realize gear repo backporting (eterbug #4766)
+- myhsh: drop out backport related defines (it will be placed in the spec by rpmbph)
+- gpush: push current branch definitely
+- rpmbs: disable GPG_AGENT_INFO if gpg-agent is not reached
+- rpmbs: fix task build on various repos
+
 etersoft-build-utils-1.7.1: 08 Jan 2010
 - myhsh: enable error if there are unpackaged files in the build, add NOSTRICT_UNPACKAGED param in config for disable new behaviour
 - rpmgp: improve package checking (support non installed packages)

bin/gpush

@@ -51,7 +51,14 @@ else
 	TARGETBRANCH=$CURRENTBRANCH
 fi
 
-echo "Push branch $TARGETBRANCH from $PROJECTNAME.git to $GIRARHOST:packages/$PROJECTNAME.git"
+if [ "$PUSHALL" = "--all" ] ; then
+	TEXTBRANCH="all branches"
+	TARGETBRANCH=
+else
+	TEXTBRANCH="branch $TARGETBRANCH"
+fi
+
+echo "Push $TEXTBRANCH from $PROJECTNAME.git to $GIRARHOST:packages/$PROJECTNAME.git"
 git push $PUSHALL $PUSHFORCE $GIRARHOST:packages/$PROJECTNAME.git $TARGETBRANCH
 git push --tags $GIRARHOST:packages/$PROJECTNAME.git $TARGETBRANCH
 

bin/rpmbph

@@ -60,7 +60,7 @@ if [ "$VENDOR" = "mdv" ] || [ "$VENDOR" = "pclinux" ] ; then
 fi
 
 # Do not add BuildReq if already exist
-cat $SPECNAME | grep rpm-build-compat &>/dev/null && BUILDREQ="$FIXPATCHFUZZ"
+cat $SPECNAME | grep rpm-build-compat &>/dev/null && BUILDREQ=""
 
 FIXMKTEMP=""
 
@@ -309,8 +309,6 @@ fi
 
 [ -n "$VERBOSE" ] && echo "DISTRVERSION=$DISTRVERSION LISTRPMARGS=$LISTRPMARGS"
 
-unset MENV MENVARG
-
 [ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs --rmsource --rmspec"
 [ -z "$BUILDCOMMAND" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbsh $GIRARHOST"
 
@@ -361,6 +359,8 @@ if [ "$VENDOR" = "alt" ] ; then
 	fi
 fi
 
+unset MENV MENVARG
+
 # handle src.rpm and spec both, LISTBUILT - result with full pathes to src.rpms
 pack_src_rpm $LISTNAMES
 

bin/rpmbs

@@ -85,6 +85,14 @@ check_gear_and_tag()
 {
 	local GEARCTAG=gear-create-tag
 
+	# FIXME: uncomment use-agent in ~/.gnupg/gpg.conf, but with ssh access to build server I got
+	#  gpg: problem with the agent - disabling agent use
+	#  gpg: Invalid passphrase; please try again ...
+
+	# gpg tries to use the agent but will fallback to the regular mode
+	# if there is a problem connecting to the agent.
+	# GPG_AGENT_INFO=
+
 	# set SPECDIR from LISTNAMES if empty
 	[ -n "$SPECDIR" ] || set_specdir $LISTNAMES
 
@@ -161,6 +169,8 @@ fi
 # set SPECDIR from LISTNAMES if empty
 [ -n "$SPECDIR" ] || set_specdir $LISTNAMES
 
+set_binaryrepo $MENV
+
 # If we build from gear repo, run task
 if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
 	echo "Run with gear repo..."
@@ -172,11 +182,9 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
 	if [ -n "$TASKNUMBER" ] ; then
 		ssh $GIRARHOST task add $TASKNUMBER repo $BASENAME $TAG
 	else
-		ssh $GIRARHOST task new
-		ssh $GIRARHOST task add repo $BASENAME $TAG || ssh $GIRARHOST task rm
-		ssh $GIRARHOST task run
+		ssh $GIRARHOST build -b $BINARYREPO $BASENAME $TAG
 	fi
-	echo "run task $BASENAME with tag $TAG at $GIRARHOST ($MENV) at `date "+%c"`" >>$RPMDIR/uploaded.log
+	echo "run task $BASENAME with tag $TAG at $GIRARHOST (in $BINARYREPO) at `date "+%c"`" >>$RPMDIR/uploaded.log
 	exit
 fi
 
@@ -199,10 +207,6 @@ if  [ -n "$REMOTEBUILD" ] ; then
 	exit 0
 fi
 
-
-#set_incoming $MENV
-set_binaryrepo $MENV
-
 if [ -n "${DELETENOW}" ]; then
 	echog "Removing did not realized yet"
 	exit 1

bin/rpmgp

@@ -152,13 +152,14 @@ phelp()
 	echog "$Descr"
 	echog "$Usage"
 	echog "Options:"
-	echog "rpmgp [-a -c -n] [system] pkgname - download src.rpm from 'system' repository to RPM/SRPMS and install it"
+	echog "rpmgp [options] [system] pkgname - download src.rpm from 'system' repository to RPM/SRPMS and install it"
 	echog " name - installed package name or src.rpm"
 	echog " system - name of system (ALT Linux by default if -a missed too)"
 	echog " -a  search pkgname in all known repositories"
 	echog " -b  install packages needed for build (use sudo apt-get) (need spec not package name)"
 	echog " -c  check if this package exists in the ALT Linux repository"
 	echog " -d  download all matched packages"
+	echog " -g  remote clone repo to USER/packages and clone it locally"
 	echog " -l  list packages needed for build (in local pkg system notation) (experimental)"
 	echog " -n  do not install after download, just download in current dir"
 	echog " -r  refresh package list (download it again)"
@@ -167,13 +168,14 @@ phelp()
 }
 
 TRYINST="1"
-while getopts :habcdlnrs opt; do
+while getopts :habcdglnrs opt; do
     case $opt in
     h) phelp; exit 0;;
     a) ALLSYSTEM=1 ;;
     b) INSTALLBINARY=1 ;;
     c) CHECKONLINE=1 ;;
     d) DOWNLOADALL=1 ;;
+    g) CLONEGIT=1 ;;
     l) LISTREQS=1 ;;
     n) TRYINST="" ;;
     r) UPDATECACHE=1 ;;
@@ -229,9 +231,22 @@ if [ -n "$INSTALLBINARY" ] ; then
 	exit 0
 fi
 
+# clone remote git
+if [ -n "$CLONEGIT" ] ; then
+	PKGNAME=$1
+	INITLETTER=$(echo $PKGNAME | sed "s/^\(.\).*/\1/g")
+	# http://git.altlinux.org/srpms/N/NAME.git
+	echo "Remote clone from /srpms/$INITLETTER/$PKGNAME.git ..."
+	ssh $GIRARHOST clone /srpms/$INITLETTER/$PKGNAME.git packages/$PKGNAME.git || fatal "Can't remote clone."
+	git clone git.alt:packages/$PKGNAME.git
+	echo "See other repos at $GIRARHOST:"
+	list_git_package $PKGNAME
+	exit 0
+fi
+
 # lists packages for build
 if [ -n "$LISTREQS" ] ; then
-	print_target_buildreq $1
+	print_target_buildreq $PKGNAME
 	exit 0
 fi
 
@@ -262,6 +277,9 @@ if [ -n "$CHECKONLINE" ] ; then
 		fi
 	fi
 	list_git_package $PKGNAME
+	# TODO: BINARYREPO
+	echo -n "ACL list for sisyphus: "
+	ssh $GIRARHOST acl sisyphus $PKGNAME show
 	
 	RET="MISSED"
 	if [ -n "$SRCRPM" ] ; then

etc/apt/apt.conf.M42

-/*
- * This is the main configuration file for the APT suite of tools,
- * see apt.conf(5) for details.
- */
-
-Dir::Etc::main "/dev/null";
-Dir::Etc::parts "/var/empty";
-Dir::Etc::SourceParts "/var/empty";
-
-Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.M42";

etc/apt/sources.list.M42

-# Package repository URLs
-#
-# You can add [alt] after rpm for digital signature check
-
-rpm file:/var/ftp/ pub/ALTLinux/4.2/branch/i586 classic
-rpm file:/var/ftp/ pub/ALTLinux/4.2/branch/noarch classic
-
-#rpm file:/var/ftp/ pub/ALTLinux/updates/4.1/i586 updates
-#rpm file:/var/ftp/ pub/ALTLinux/backports/4.1/i586 backports

etersoft-build-utils.spec

 Name: etersoft-build-utils
-Version: 1.7.1
+Version: 1.7.3
 Release: alt1
 
 Summary: A set of build rpm utilities
@@ -64,6 +64,18 @@ RECOMMENDED packages: gcc-c++ perl-libwww ccache elinks mutt hasher curl
 %config(noreplace) %_sysconfdir/eterbuild/repos
 
 %changelog
+* Wed Jan 13 2010 Vitaly Lipatov <lav@altlinux.ru> 1.7.3-alt1
+- rpmgp: add acl list printing
+- gpush: push without branch if --all
+- rpmbph: do not insert fix for fuzzy patch in any case
+- rpmgp: add -g option for remote and locally repo clone
+
+* Fri Jan 08 2010 Vitaly Lipatov <lav@altlinux.ru> 1.7.2-alt1
+- rpmbph: realize gear repo backporting (eterbug #4766)
+- myhsh: drop out backport related defines (it will be placed in the spec by rpmbph)
+- gpush: push current branch definitely
+- rpmbs: fix task build on various repos
+
 * Fri Jan 08 2010 Vitaly Lipatov <lav@altlinux.ru> 1.7.1-alt1
 - myhsh: error if there are unpackaged files in the build
 - rpmgp: improve package checking (support non installed packages)