smecontribs/common/cvs-import.sh

#!/bin/bash
#
# Import a given src.rpm on a given branch
# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
# Copyright (C) 2004-2005 Red Hat, Inc.
# Copyright (C) 2005 Fedora Foundation
#
# $Id: cvs-import.sh,v 1.8 2011/11/03 22:47:20 slords Exp $

shopt -s nocasematch

# Initial setup
CVSTREE=${CVSTREE:=extras}
TOPLEVEL=${TOPLEVEL:=rpms}

# Check that we're being run from a good location
MYDIR=$(dirname $0)
if [ ! -f ${MYDIR}/CVS/Root ] ; then
    echo "ERROR: You need to run this script from the 'common' checkout" >&2
    exit 1
fi

# use the CVSROOT from the checkout
CVSROOT=$(cat ${MYDIR}/CVS/Root)

# use the TAG from the checkout
TAG=$(sed -n 's@^T@@p' $(pwd)/CVS/Tag 2> /dev/null)

# We need a writable directory for temporary checkouts and CVS work
WORKDIR="/tmp"
if test -w $(pwd) ; then
    WORKDIR="$(pwd)"
fi

[ -f branch ] && BRANCH=$(cat branch)

# short usage help
Usage() {
    cat <<EOF
Usage:

    $0 [-b <branch>] [-t <cvs tag/branch>] [-m <message>] <package>

Imports a package into the cvs repository. Will use the following defaults:
CVSROOT    = $CVSROOT
BRANCH     = ${BRANCH:-devel}
TAG        = ${TAG}

The package can also be imported on a PRE-EXISTING branch using the 
"-b BRANCH" flag. This script can not create new branches for you.
EOF
    exit 1
}

# Parse arguments
MESSAGE=
while [ -n "$1" ] ; do
    case "$1" in 
        # import the package on the given branch. If the branch does
        # not exist, we will branch the HEAD and then we will perform
        # the import
        -t | --tag )
            shift
            TAG="$1"
            if [ -z "$TAG" ] ; then
                echo "ERROR: --tag requires an argument"
                Usage
                exit -1
            fi
            ;;

        -b | --branch )
            shift
            BRANCH="$1"
            if [ -z "$BRANCH" ] ; then
                echo "ERROR: --branch requires an argument"
                Usage
                exit -1
            fi
            # protect against moronisms
            if [ "$BRANCH" = "HEAD" -o "$BRANCH" = "devel" ] ; then
                BRANCH=
            fi
            ;;

        -m | --message )
            shift
            MESSAGE="$1"
            ;;

        # the always helpful help message
        -h | --help )
            Usage
            exit 0
            ;;

        * )
            if [ -n "$PACKAGE" ] ; then
                echo "ERROR: Only one package at a time, please" >&2
                echo "Already got request for $PACKAGE" >&2
                exit -1
            fi
            PACKAGE="$1"
            if [ ! -e "$PACKAGE" ] ; then
                echo "ERROR: Package $PACKAGE does not exist"
                Usage
                exit -2
            fi
            NVR=$(rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}" $PACKAGE 2>/dev/null)
            SRCRPM=$(rpm -qp --qf "%{SOURCERPM}" $PACKAGE 2>/dev/null)
            if [ -z "$NVR" -o "$SRCRPM" != "(none)" ] ; then
                echo "ERROR: Package $PACKAGE does not look like a source RPM package"
                Usage
                exit -3
            fi
            # extract NAME VERSION RELEASE, like a 31337 h@x0r
            RELEASE=${NVR##*-}
            NAME=${NVR%%-$RELEASE}
            VERSION=${NAME##*-}
            NAME=${NAME%%-$VERSION}
            ;;
    esac
    shift
done

if [ -z "$PACKAGE" ] ; then
    echo "RPM source package required for import"
    Usage
    exit 0
fi

# make sure the PACKAGE is an absolute path, as we'll be changing
# directories fairly often in this script
PACKAGE="$(cd $(dirname $PACKAGE) && pwd)/$(basename $PACKAGE)"

# all well
export CVSROOT
CVS="cvs -d $CVSROOT"

# Grab a temp dir    
TMPDIR=$(mktemp -d $WORKDIR/tmpcvsXXXXXX)
trap "rm -rf $TMPDIR" 0 9 15

# A cleanup function that can be called from random places
CleanUp() {
    if [ -n "$LOGFILE" ] ; then
        rm -f $LOGFILE
    fi
    cd ${WORKDIR}
    rm -rf $TMPDIR
    echo
}

CreateBranchMakefile() {
    cat >Makefile <<EOF
# Makefile for source rpm: $NAME
# \$Id\$
NAME := $NAME
SPECFILE = \$(firstword \$(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f \$\$d/Makefile.common ] ; then if [ -f \$\$d/CVS/Root -a -w \$\$/Makefile.common ] ; then cd \$\$d ; cvs -Q update ; fi ; echo "\$\$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := \$(shell \$(find-makefile-common))

ifeq (\$(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d \$\$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := \$(shell \$(checkout-makefile-common))
endif

include \$(MAKEFILE_COMMON)
EOF
}

# Check out the existing module
cd $TMPDIR
echo "Checking out module: '$NAME'"
$CVS -Q checkout ${TAG:+-r $TAG} $TOPLEVEL/$NAME || { echo "ERROR: \"$NAME\" module does not exist in cvs."; exit 1; }

# this is our working directory
cd $TOPLEVEL/$NAME

[ -d ${BRANCH} ] || { echo "ERROR: \"$NAME/$BRANCH\" does not exist!"; exit 1; }

# check if we have imported this entry
TAG=$(echo "${NAME##[0-9]}-$VERSION-$RELEASE" | sed -e 's/[$,.:;@]/_/g')
LOG_ENTRY="$TAG:${BRANCH:-HEAD}:$(basename $PACKAGE)"
if [ -n "$(grep ""^$LOG_ENTRY"" ./${BRANCH}/import.log 2>/dev/null)" ] ; then
    echo "ERROR: $PACKAGE was already imported on branch ${BRANCH:-HEAD}"
    CleanUp
    exit -2
fi
# Check here as well because back in the old days we used to write it here
if [ -n "$(grep ""^$LOG_ENTRY"" ./import.log 2>/dev/null)" ] ; then
    echo "ERROR: $PACKAGE was already imported on branch ${BRANCH:-HEAD}"
    CleanUp
    exit -2
fi

# Now the real import job is starting up
BRANCH="${BRANCH:-devel}"

# Unpack the src.rpm
TMP2=$(mktemp -d tmpXXXXXX)
pushd $TMP2 >/dev/null
echo "Unpacking source package: $(basename $PACKAGE)..."
rpm2cpio $PACKAGE | cpio -id --quiet || {
    echo "This package appears to be corrupt."
    echo "Skipping import for: $PACKAGE"
    CleanUp
    exit -1
} >&2
popd >/dev/null

# grab a list of files from the src.rpm
FILES=$(rpm -qpl $PACKAGE 2>/dev/null)
    
# Remove the files that are no longer present
OLDFILES=$(find ${BRANCH} -maxdepth 1 -type f \
    -not -name branch \
    -not -name import.log \
    -not -name sources \
    -not -name Makefile \
    -not -name .cvsignore \
    -print )
for f in $OLDFILES ; do
    if [ ! -f "$TMP2/$(basename $f)" ] ; then
        cvs -Q delete -f $f
        echo "R $(basename $f)"
    fi
done

# Add the new files
>${BRANCH}/sources.new
>${BRANCH}/.cvsignore.new

# Now build a list of what needs to be uploaded
UPLOADFILES=
for _f in $FILES ; do
    # just to be sure. Who knows when rpm will start returning
    # pathnames in src.rpm queries
    f=$(basename ${_f})

    add_file="yes"
    file_md5=$(cd $TMP2 && md5sum $f)
    file_size=$(stat --format="%s" $TMP2/$f)

    # if the file exists or it is listed in the sources we don't add it
    if [ -f ${BRANCH}/$f ] ; then
        add_file="no"
        cmp -s $TMP2/$f ${BRANCH}/$f || echo "U $f"
    elif [ -n "$(grep ""$file_md5"" ${BRANCH}/sources 2>/dev/null)" ] ; then
        add_file="no"
        # keep it around...
        echo "$file_md5" >> ${BRANCH}/sources.new
        echo "$f" >> ${BRANCH}/.cvsignore.new
    fi
    # we catch changed patches this way...
    mv -f $TMP2/$f ${BRANCH}/$f
    # we need to add this file
    pushd ${BRANCH} >/dev/null
    if [ "$add_file" = "yes" ] ; then
        case $f in 
            *.tar | *gz | *.bz2 | *.lzma | *.Z | *.zip | \
            *.ttf | *.bin | *.tbz | *.tbz2 | *.pdf | *.rpm | \
            *.jar | *.war | *.db | *.cpio | *.jisp | *.egg | *.gem )
                UPLOADFILES="$UPLOADFILES $f"
                if [ -n "$(grep $f sources 2>/dev/null)" ] ; then
                    # this file existed before with a different md5sum
                    echo "N $f"
                else
                    echo "L $f"
                fi
                ;;
            *)
                cvs -Q add -ko $f 
                echo "A $f"
                ;;
        esac
    fi
    popd >/dev/null
done
# upload the tarballs
pushd ${BRANCH} >/dev/null
# Re-add the branch Makefile (during resurrection of dead packages).
if [ ! -f Makefile ] ; then
    CreateBranchMakefile
    cvs -Q add Makefile
fi
rm -f sources && mv sources.new sources
rm -f .cvsignore && mv .cvsignore.new .cvsignore
if [ -n "$UPLOADFILES" ] ; then
    make upload FILES="$UPLOADFILES" || {
        echo "ERROR: Uploading the source tarballs failed!"
        exit 9
    }
fi
popd >/dev/null

# We no longer need this
rm -rf $TMP2

# setup finished
[ -f ./${BRANCH}/import.log ] || $(touch ./${BRANCH}/import.log; cvs add ./${BRANCH}/import.log)
echo "$LOG_ENTRY:$(date +%s)" >> ./${BRANCH}/import.log

echo "======================================================================="
cvs -Q diff -u
echo "======================================================================="
echo "Please check the above cvs diff."
echo "If you want to make any changes before committing, please press Ctrl-C."
echo "Otherwise press Enter to proceed to commit." 
read

cvs -Q update && \
    echo "cvs commit..." && \
    cvs -Q commit ${MESSAGE:+-m "$MESSAGE"} && echo "Commit Complete" && \
    cd ${BRANCH} && cvs tag ${TAG} && echo "Tagging '${TAG}' complete."

# Clean up
CleanUp
1	#!/bin/bash
2	#
3	# Import a given src.rpm on a given branch
4	# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
5	# Copyright (C) 2004-2005 Red Hat, Inc.
6	# Copyright (C) 2005 Fedora Foundation
7	#
8	# $Id: cvs-import.sh,v 1.8 2011/11/03 22:47:20 slords Exp $
9
10	shopt -s nocasematch
11
12	# Initial setup
13	CVSTREE=${CVSTREE:=extras}
14	TOPLEVEL=${TOPLEVEL:=rpms}
15
16	# Check that we're being run from a good location
17	MYDIR=$(dirname $0)
18	if [ ! -f ${MYDIR}/CVS/Root ] ; then
19	echo "ERROR: You need to run this script from the 'common' checkout" >&2
20	exit 1
21	fi
22
23	# use the CVSROOT from the checkout
24	CVSROOT=$(cat ${MYDIR}/CVS/Root)
25
26	# use the TAG from the checkout
27	TAG=$(sed -n 's@^T@@p' $(pwd)/CVS/Tag 2> /dev/null)
28
29	# We need a writable directory for temporary checkouts and CVS work
30	WORKDIR="/tmp"
31	if test -w $(pwd) ; then
32	WORKDIR="$(pwd)"
33	fi
34
35	[ -f branch ] && BRANCH=$(cat branch)
36
37	# short usage help
38	Usage() {
39	cat <<EOF
40	Usage:
41
42	$0 [-b <branch>] [-t <cvs tag/branch>] [-m <message>] <package>
43
44	Imports a package into the cvs repository. Will use the following defaults:
45	CVSROOT = $CVSROOT
46	BRANCH = ${BRANCH:-devel}
47	TAG = ${TAG}
48
49	The package can also be imported on a PRE-EXISTING branch using the
50	"-b BRANCH" flag. This script can not create new branches for you.
51	EOF
52	exit 1
53	}
54
55	# Parse arguments
56	MESSAGE=
57	while [ -n "$1" ] ; do
58	case "$1" in
59	# import the package on the given branch. If the branch does
60	# not exist, we will branch the HEAD and then we will perform
61	# the import
62	-t \| --tag )
63	shift
64	TAG="$1"
65	if [ -z "$TAG" ] ; then
66	echo "ERROR: --tag requires an argument"
67	Usage
68	exit -1
69	fi
70	;;
71
72	-b \| --branch )
73	shift
74	BRANCH="$1"
75	if [ -z "$BRANCH" ] ; then
76	echo "ERROR: --branch requires an argument"
77	Usage
78	exit -1
79	fi
80	# protect against moronisms
81	if [ "$BRANCH" = "HEAD" -o "$BRANCH" = "devel" ] ; then
82	BRANCH=
83	fi
84	;;
85
86	-m \| --message )
87	shift
88	MESSAGE="$1"
89	;;
90
91	# the always helpful help message
92	-h \| --help )
93	Usage
94	exit 0
95	;;
96
97	* )
98	if [ -n "$PACKAGE" ] ; then
99	echo "ERROR: Only one package at a time, please" >&2
100	echo "Already got request for $PACKAGE" >&2
101	exit -1
102	fi
103	PACKAGE="$1"
104	if [ ! -e "$PACKAGE" ] ; then
105	echo "ERROR: Package $PACKAGE does not exist"
106	Usage
107	exit -2
108	fi
109	NVR=$(rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}" $PACKAGE 2>/dev/null)
110	SRCRPM=$(rpm -qp --qf "%{SOURCERPM}" $PACKAGE 2>/dev/null)
111	if [ -z "$NVR" -o "$SRCRPM" != "(none)" ] ; then
112	echo "ERROR: Package $PACKAGE does not look like a source RPM package"
113	Usage
114	exit -3
115	fi
116	# extract NAME VERSION RELEASE, like a 31337 h@x0r
117	RELEASE=${NVR##*-}
118	NAME=${NVR%%-$RELEASE}
119	VERSION=${NAME##*-}
120	NAME=${NAME%%-$VERSION}
121	;;
122	esac
123	shift
124	done
125
126	if [ -z "$PACKAGE" ] ; then
127	echo "RPM source package required for import"
128	Usage
129	exit 0
130	fi
131
132	# make sure the PACKAGE is an absolute path, as we'll be changing
133	# directories fairly often in this script
134	PACKAGE="$(cd $(dirname $PACKAGE) && pwd)/$(basename $PACKAGE)"
135
136	# all well
137	export CVSROOT
138	CVS="cvs -d $CVSROOT"
139
140	# Grab a temp dir
141	TMPDIR=$(mktemp -d $WORKDIR/tmpcvsXXXXXX)
142	trap "rm -rf $TMPDIR" 0 9 15
143
144	# A cleanup function that can be called from random places
145	CleanUp() {
146	if [ -n "$LOGFILE" ] ; then
147	rm -f $LOGFILE
148	fi
149	cd ${WORKDIR}
150	rm -rf $TMPDIR
151	echo
152	}
153
154	CreateBranchMakefile() {
155	cat >Makefile <<EOF
156	# Makefile for source rpm: $NAME
157	# \$Id\$
158	NAME := $NAME
159	SPECFILE = \$(firstword \$(wildcard *.spec))
160
161	define find-makefile-common
162	for d in common ../common ../../common ; do if [ -f \$\$d/Makefile.common ] ; then if [ -f \$\$d/CVS/Root -a -w \$\$/Makefile.common ] ; then cd \$\$d ; cvs -Q update ; fi ; echo "\$\$d/Makefile.common" ; break ; fi ; done
163	endef
164
165	MAKEFILE_COMMON := \$(shell \$(find-makefile-common))
166
167	ifeq (\$(MAKEFILE_COMMON),)
168	# attept a checkout
169	define checkout-makefile-common
170	test -f CVS/Root && { cvs -Q -d \$\$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } \|\| { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
171	endef
172
173	MAKEFILE_COMMON := \$(shell \$(checkout-makefile-common))
174	endif
175
176	include \$(MAKEFILE_COMMON)
177	EOF
178	}
179
180	# Check out the existing module
181	cd $TMPDIR
182	echo "Checking out module: '$NAME'"
183	$CVS -Q checkout ${TAG:+-r $TAG} $TOPLEVEL/$NAME \|\| { echo "ERROR: \"$NAME\" module does not exist in cvs."; exit 1; }
184
185	# this is our working directory
186	cd $TOPLEVEL/$NAME
187
188	[ -d ${BRANCH} ] \|\| { echo "ERROR: \"$NAME/$BRANCH\" does not exist!"; exit 1; }
189
190	# check if we have imported this entry
191	TAG=$(echo "${NAME##[0-9]}-$VERSION-$RELEASE" \| sed -e 's/[$,.:;@]/_/g')
192	LOG_ENTRY="$TAG:${BRANCH:-HEAD}:$(basename $PACKAGE)"
193	if [ -n "$(grep ""^$LOG_ENTRY"" ./${BRANCH}/import.log 2>/dev/null)" ] ; then
194	echo "ERROR: $PACKAGE was already imported on branch ${BRANCH:-HEAD}"
195	CleanUp
196	exit -2
197	fi
198	# Check here as well because back in the old days we used to write it here
199	if [ -n "$(grep ""^$LOG_ENTRY"" ./import.log 2>/dev/null)" ] ; then
200	echo "ERROR: $PACKAGE was already imported on branch ${BRANCH:-HEAD}"
201	CleanUp
202	exit -2
203	fi
204
205	# Now the real import job is starting up
206	BRANCH="${BRANCH:-devel}"
207
208	# Unpack the src.rpm
209	TMP2=$(mktemp -d tmpXXXXXX)
210	pushd $TMP2 >/dev/null
211	echo "Unpacking source package: $(basename $PACKAGE)..."
212	rpm2cpio $PACKAGE \| cpio -id --quiet \|\| {
213	echo "This package appears to be corrupt."
214	echo "Skipping import for: $PACKAGE"
215	CleanUp
216	exit -1
217	} >&2
218	popd >/dev/null
219
220	# grab a list of files from the src.rpm
221	FILES=$(rpm -qpl $PACKAGE 2>/dev/null)
222
223	# Remove the files that are no longer present
224	OLDFILES=$(find ${BRANCH} -maxdepth 1 -type f \
225	-not -name branch \
226	-not -name import.log \
227	-not -name sources \
228	-not -name Makefile \
229	-not -name .cvsignore \
230	-print )
231	for f in $OLDFILES ; do
232	if [ ! -f "$TMP2/$(basename $f)" ] ; then
233	cvs -Q delete -f $f
234	echo "R $(basename $f)"
235	fi
236	done
237
238	# Add the new files
239	>${BRANCH}/sources.new
240	>${BRANCH}/.cvsignore.new
241
242	# Now build a list of what needs to be uploaded
243	UPLOADFILES=
244	for _f in $FILES ; do
245	# just to be sure. Who knows when rpm will start returning
246	# pathnames in src.rpm queries
247	f=$(basename ${_f})
248
249	add_file="yes"
250	file_md5=$(cd $TMP2 && md5sum $f)
251	file_size=$(stat --format="%s" $TMP2/$f)
252
253	# if the file exists or it is listed in the sources we don't add it
254	if [ -f ${BRANCH}/$f ] ; then
255	add_file="no"
256	cmp -s $TMP2/$f ${BRANCH}/$f \|\| echo "U $f"
257	elif [ -n "$(grep ""$file_md5"" ${BRANCH}/sources 2>/dev/null)" ] ; then
258	add_file="no"
259	# keep it around...
260	echo "$file_md5" >> ${BRANCH}/sources.new
261	echo "$f" >> ${BRANCH}/.cvsignore.new
262	fi
263	# we catch changed patches this way...
264	mv -f $TMP2/$f ${BRANCH}/$f
265	# we need to add this file
266	pushd ${BRANCH} >/dev/null
267	if [ "$add_file" = "yes" ] ; then
268	case $f in
269	.tar \| gz \| .bz2 \| .lzma \| .Z \| .zip \| \
270	.ttf \| .bin \| .tbz \| .tbz2 \| .pdf \| .rpm \| \
271	.jar \| .war \| .db \| .cpio \| .jisp \| .egg \| *.gem )
272	UPLOADFILES="$UPLOADFILES $f"
273	if [ -n "$(grep $f sources 2>/dev/null)" ] ; then
274	# this file existed before with a different md5sum
275	echo "N $f"
276	else
277	echo "L $f"
278	fi
279	;;
280	*)
281	cvs -Q add -ko $f
282	echo "A $f"
283	;;
284	esac
285	fi
286	popd >/dev/null
287	done
288	# upload the tarballs
289	pushd ${BRANCH} >/dev/null
290	# Re-add the branch Makefile (during resurrection of dead packages).
291	if [ ! -f Makefile ] ; then
292	CreateBranchMakefile
293	cvs -Q add Makefile
294	fi
295	rm -f sources && mv sources.new sources
296	rm -f .cvsignore && mv .cvsignore.new .cvsignore
297	if [ -n "$UPLOADFILES" ] ; then
298	make upload FILES="$UPLOADFILES" \|\| {
299	echo "ERROR: Uploading the source tarballs failed!"
300	exit 9
301	}
302	fi
303	popd >/dev/null
304
305	# We no longer need this
306	rm -rf $TMP2
307
308	# setup finished
309	[ -f ./${BRANCH}/import.log ] \|\| $(touch ./${BRANCH}/import.log; cvs add ./${BRANCH}/import.log)
310	echo "$LOG_ENTRY:$(date +%s)" >> ./${BRANCH}/import.log
311
312	echo "======================================================================="
313	cvs -Q diff -u
314	echo "======================================================================="
315	echo "Please check the above cvs diff."
316	echo "If you want to make any changes before committing, please press Ctrl-C."
317	echo "Otherwise press Enter to proceed to commit."
318	read
319
320	cvs -Q update && \
321	echo "cvs commit..." && \
322	cvs -Q commit ${MESSAGE:+-m "$MESSAGE"} && echo "Commit Complete" && \
323	cd ${BRANCH} && cvs tag ${TAG} && echo "Tagging '${TAG}' complete."
324
325	# Clean up
326	CleanUp