Attachment 146107 Details for Bug 192881 – databases/gnats4 STAGED source, and other corrections

databases/gnats4 STAGED source, and other corrections

gnats4.shar (text/plain), 25.01 KB, created by Chris Hutchinson on 2014-08-21 08:02:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2014-08-21 08:02:02 UTC

Size: 25.01 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	gnats4
>#	gnats4/files
>#	gnats4/files/patch-send-pr__Makefile.in
>#	gnats4/files/patch-gnats__dbconfig.in
>#	gnats4/files/patch-gnats__Makefile.in
>#	gnats4/files/patch-gnats__gnats.h
>#	gnats4/files/patch-Makefile.in
>#	gnats4/files/patch-send-pr_install-sid.sh
>#	gnats4/files/patch-gnats__edit-pr.sh
>#	gnats4/files/extrapatch-gnats__edit-pr.sh
>#	gnats4/pkg-plist
>#	gnats4/Makefile
>#	gnats4/distinfo
>#	gnats4/pkg-descr
>#	gnats4/pkg-message
>#	gnats4/pkg-install
>#
>echo c - gnats4
>mkdir -p gnats4 > /dev/null 2>&1
>echo c - gnats4/files
>mkdir -p gnats4/files > /dev/null 2>&1
>echo x - gnats4/files/patch-send-pr__Makefile.in
>sed 's/^X//' >gnats4/files/patch-send-pr__Makefile.in << '2b4943d0925bdbfbbac087617a9c5bd5'
>X--- send-pr/Makefile.in.orig	Mon Aug  1 12:54:35 2005
>X+++ send-pr/Makefile.in	Mon Aug  1 12:53:52 2005
>X@@ -55,7 +55,7 @@
>X INSTALL = @INSTALL@
>X INSTALL_PROGRAM = @INSTALL_PROGRAM@
>X INSTALL_DATA = @INSTALL_DATA@
>X-INSTALL_SCRIPT = @INSTALL_PROGRAM@
>X+INSTALL_SCRIPT = @INSTALL_SCRIPT@
>X 
>X CFLAGS = -g
>X LDFLAGS = -g
>2b4943d0925bdbfbbac087617a9c5bd5
>echo x - gnats4/files/patch-gnats__dbconfig.in
>sed 's/^X//' >gnats4/files/patch-gnats__dbconfig.in << 'e365b59eb1150cf97b1d0e2105fc0512'
>X--- ./gnats/dbconfig.in.orig	2002-10-31 21:28:52.000000000 +0100
>X+++ ./gnats/dbconfig.in	2011-06-12 09:58:06.000000000 +0200
>X@@ -756,7 +756,8 @@
>X     }
>X     # A somewhat convoluted binary format is used when binary-index is set
>X     # to true.
>X-    binary-index true
>X+    #binary-index true
>X+    binary-index false
>X }
>X 
>X # initial-entry describes which fields should be present on initial entry;
>e365b59eb1150cf97b1d0e2105fc0512
>echo x - gnats4/files/patch-gnats__Makefile.in
>sed 's/^X//' >gnats4/files/patch-gnats__Makefile.in << 'b20b366cd1890e0957b03c5242fba68e'
>X--- gnats/Makefile.in.orig	Thu Feb 24 22:35:55 2005
>X+++ gnats/Makefile.in	Mon Aug  1 15:08:51 2005
>X@@ -93,7 +93,7 @@
>X 
>X INSTALL = $(srcdir)/../install-sh -c
>X INSTALL_PROGRAM = @INSTALL_PROGRAM@
>X-INSTALL_SCRIPT = @INSTALL_PROGRAM@
>X+INSTALL_SCRIPT = @INSTALL_SCRIPT@
>X INSTALL_DATA = @INSTALL_DATA@
>X 
>X SUB_INSTALL = `echo $(INSTALL) | sed 's,^$[^/]$,../\1,'`
>X@@ -109,6 +109,7 @@
>X libdir = @libdir@
>X libexecdir = @libexecdir@
>X statedir = @datadir@
>X+sharedstatedir = @sharedstatedir@
>X sysconfdir = @sysconfdir@
>X 
>X program_transform_name =
>X@@ -162,7 +163,7 @@
>X 	check-db delete-pr dbconfig gnats-databases gnats-pwconv $(EXTRA_STUFF)
>X 
>X all-tools: libgnats.a query-pr pr-age pr-edit edit-pr file-pr getclose \
>X-	config-send-pr mail-agent dbconfig diff-prs
>X+	mail-agent dbconfig diff-prs
>X 
>X libgnats.a: $(LIBOBJS)
>X 	-rm -f tmplibgnats.a libgnats.a
>X@@ -368,15 +369,17 @@
>X install-tools-arch-dep: install-tools-bin
>X 
>X install-tools-arch-indep: all-tools
>X-	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnats
>X+	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sharedstatedir)/gnats
>X 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sysconfdir)/gnats/defaults
>X 	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
>X-	  echo "chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \
>X-	  chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats ; \
>X+	  echo "chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats" ; \
>X+	  chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats ; \
>X         else \
>X-	  echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \
>X+	  echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats" ; \
>X+	fi
>X+	@if [ x"$(lispdir)" != x ]; then \
>X+	  $(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el ; \
>X 	fi
>X-	$(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el
>X 	for i in categories submitters responsible gnatsd.user_access addresses states classes dbconfig ; do \
>X 	    if [ -f "$$i" ] ; then \
>X 		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \
>X@@ -391,7 +394,7 @@
>X 	$(INSTALL_SCRIPT) edit-pr $(DESTDIR)$(bindir)/edit-pr
>X 	$(INSTALL_SCRIPT) diff-prs $(DESTDIR)$(libexecdir)/gnats/diff-prs
>X 	$(INSTALL_SCRIPT) mail-agent $(DESTDIR)$(libexecdir)/gnats/mail-agent
>X-	$(INSTALL_PROGRAM) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
>X+	$(INSTALL_SCRIPT) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
>X 	$(INSTALL_PROGRAM) pr-age $(DESTDIR)$(libexecdir)/gnats/pr-age
>X 	$(INSTALL_PROGRAM) pr-edit $(DESTDIR)$(libexecdir)/gnats/pr-edit
>X 	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
>X@@ -409,29 +412,29 @@
>X install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL)
>X 
>X install-gnats-arch-indep: all-gnats install-tools-arch-indep
>X-	@if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ]; then \
>X-	  echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE), it's already there." ; \
>X+	@if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ]; then \
>X+	  echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default, it's already there." ; \
>X 	  true ; \
>X 	else \
>X 	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
>X 	    $(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \
>X-	                    $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
>X+	                    $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \
>X 	  else \
>X-	    $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
>X-	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE)" ; \
>X+	    $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \
>X+	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default" ; \
>X 	  fi \
>X 	fi
>X-	@if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ]; then \
>X-	   echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE), it's already there." ; \
>X+	@if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ]; then \
>X+	   echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default, it's already there." ; \
>X 	   true ; \
>X 	else \
>X 	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
>X 	    $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \
>X-	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
>X+	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \
>X           else \
>X 	    $(INSTALL_DATA) $(srcdir)/gnatsd.host_access \
>X-	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
>X-	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE)" ; \
>X+	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \
>X+	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default" ; \
>X 	  fi \
>X 	fi
>X 	@echo "*** If you're a first-time user, you'll want to create a new database";
>b20b366cd1890e0957b03c5242fba68e
>echo x - gnats4/files/patch-gnats__gnats.h
>sed 's/^X//' >gnats4/files/patch-gnats__gnats.h << '2c21f1dbc81ddaf136dd86dcae358c34'
>X--- gnats/gnats.h.orig	2013-06-10 10:33:17.000000000 +0300
>X+++ gnats/gnats.h	2013-06-10 10:33:26.000000000 +0300
>X@@ -137,9 +137,6 @@
>X # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
>X #endif
>X 
>X-extern int asprintf (char **buf, const char *fmt, ...);
>X-extern int vasprintf (char **buf, const char *fmt, va_list args);
>X-
>X #if ! HAVE_DECL_UNSETENV
>X extern void unsetenv (const char *name);
>X #endif
>2c21f1dbc81ddaf136dd86dcae358c34
>echo x - gnats4/files/patch-Makefile.in
>sed 's/^X//' >gnats4/files/patch-Makefile.in << 'c66f1ff516948cfffe16af840829ac43'
>X--- Makefile.in.orig	Mon Aug  1 14:22:39 2005
>X+++ Makefile.in	Mon Aug  1 14:22:58 2005
>X@@ -48,7 +48,7 @@
>X 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' $@
>X 
>X install-tools:
>X-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' $@
>X+	for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
>X 
>X uninstall:
>X 	for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
>c66f1ff516948cfffe16af840829ac43
>echo x - gnats4/files/patch-send-pr_install-sid.sh
>sed 's/^X//' >gnats4/files/patch-send-pr_install-sid.sh << '29844256551368186d14fa388c3ce7df'
>X--- send-pr/install-sid.sh.orig	2008-07-22 12:35:01.000000000 +0300
>X+++ send-pr/install-sid.sh	2008-07-22 12:35:11.000000000 +0300
>X@@ -27,7 +27,7 @@
>X sysconfdir="@sysconfdir@"
>X 
>X COMMAND=`echo $0 | sed -e 's,.*/,,g'`
>X-function usage() {
>X+usage() {
>X 	cat << __EOF__ >&2
>X Usage: $COMMAND [OPTIONS] submitter-id
>X 
>29844256551368186d14fa388c3ce7df
>echo x - gnats4/files/patch-gnats__edit-pr.sh
>sed 's/^X//' >gnats4/files/patch-gnats__edit-pr.sh << '47fbc6d8836f58e7a62278cc23d21f18'
>X--- gnats/edit-pr.sh.orig	2011-12-12 13:42:33.000000000 +0200
>X+++ gnats/edit-pr.sh	2011-12-12 13:43:51.000000000 +0200
>X@@ -169,7 +169,7 @@
>X 	    type="`$QUERY_PR --field-type $field`"
>X 	    case $type in
>X 		[Ee][Nn][Uu][Mm])
>X-		    values=`$QUERY_PR --valid-values $field | tr '\n' ' ' | sed 's/ *$//g; s/ / | /g;s/^/[ /;s/$/ ]/;`
>X+		    values=`$QUERY_PR --valid-values $field | tr '\n' ' ' | sed 's/ *$//g; s/ / | /g;s/^/[ /;s/$/ ]/;'`
>X 		    valslen=`echo "$values" | wc -c`
>X 		    if [ "$valslen" -gt 160 ]
>X 		    then
>47fbc6d8836f58e7a62278cc23d21f18
>echo x - gnats4/files/extrapatch-gnats__edit-pr.sh
>sed 's/^X//' >gnats4/files/extrapatch-gnats__edit-pr.sh << '46d036fb2bf1b61a230d88b16f5bbb0d'
>X--- gnats/edit-pr.sh.orig	Sun May 26 16:32:02 2002
>X+++ gnats/edit-pr.sh	Sat Dec  6 02:43:44 2003
>X@@ -5,6 +5,8 @@
>X # Contributed by Jeffrey Osier (jeffrey@cygnus.com).
>X # Majorly revised by Bob Manson (manson@juniper.net).
>X # Further improvements by Dirk Bergstrom (dirk@juniper.net).
>X+# Patches for the FreeBSD Project by Ceri Davies (ceri@FreeBSD.org),
>X+# based on work by Paul Richards (paul@FreeBSD.org).
>X #
>X # This file is part of GNU GNATS.
>X #
>X@@ -24,9 +26,12 @@
>X 
>X debug_print=false # or echo to get output.
>X BINDIR=xBINDIRx
>X+DATE=`LC_TIME=C date`	# Some prstats tools rely on this format
>X+GNATS_ROOT=${GNATS_ROOT:-/usr/local/share/gnats/gnats-db}; export GNATS_ROOT
>X LIBEXECDIR=xLIBEXECDIRx
>X GNATS_PORT=
>X locked=
>X+rc=0
>X version=xVERSIONx
>X 
>X usage="
>X@@ -99,28 +104,23 @@
>X 
>X      *)
>X        if [ "`echo $1 | grep /`" != "" ]; then
>X-         pr_id=`echo $1 | awk -F"/" '{print $2}' -`
>X+         pr=`echo $1 | awk -F"/" '{print $2}' -`
>X        else
>X-         pr_id=$1
>X+         pr=$1
>X        fi
>X+       prs="$prs $pr"
>X        ;;
>X    esac
>X    shift
>X done
>X 
>X+chng_tpl="${GNATS_ROOT}/gnats-adm/edit-pr-msg"
>X+
>X # set command here to always pass host and port, and directory if supplied
>X QUERY_PR="$BINDIR/query-pr $GNATS_HOST $GNATS_PORT $GNATS_DB $EDIT_USER $EDIT_PASSWD"
>X PR_ADDR="$QUERY_PR --responsible-address"
>X PR_EDIT="$LIBEXECDIR/gnats/pr-edit $GNATS_HOST $GNATS_PORT $EDIT_USER $EDIT_PASSWD $GNATS_DB"
>X 
>X-# These traps take care of deleting all the /tmp files
>X-trap 'rm -f $new.old $change_msg $fixfil' 0
>X-# Don't delete $new on error signals
>X-trap 'if [ "$locked" != "" ]; then \
>X-        $PR_EDIT --unlock $pr_id ; \
>X-	locked= ; \
>X-      fi' 1 2 3 13 15
>X-
>X # find a user name
>X if [ "$USER" != "" ]; then
>X   me=$USER
>X@@ -138,85 +138,45 @@
>X   full_me="$me"
>X fi
>X 
>X+for pr_id in $prs ; do
>X+
>X+epdir=`mktemp -d /tmp/epXXXXXX || exit 75`
>X+chng_msg="$epdir/chng.$pr_id.$$"
>X # new = temp file to use for editing
>X-new="/tmp/ep$$"
>X-newtmp="/tmp/ep$$.tp"
>X-change_msg="/tmp/ep$$.ch"
>X-fixfil="/tmp/ep$$.fx"
>X+new="$epdir/$pr_id.ep$$"
>X+change_msg="$epdir/ep$$.$pr_id.ch"
>X+keepnew=
>X+
>X+# These traps take care of deleting all the /tmp files
>X+trap 'rm -f $new.old $change_msg chng_msg; rmdir $epdir 2>/dev/null' 0
>X+trap 'if [ "$locked" != "" ]; then \
>X+        $PR_EDIT --unlock $pr_id ; \
>X+	locked= ; \
>X+      fi; \
>X+      rm -f $new.old $change_msg chng_msg; rmdir $epdir 2>/dev/null' 1 2 3 13 15
>X+
>X 
>X # lock the pr
>X $debug_print "Locking $pr_id."
>X-lock=`$PR_EDIT --lock=$full_me --process=$$ $pr_id 2>&1 > $new`
>X+lock=`$PR_EDIT --lock=$me --process=$$ $pr_id 2>&1 > $new`
>X locked=t
>X 
>X if [ "$lock" != "" ] ; then
>X+  echo "Failed to lock PR $pr_id"
>X   echo $lock
>X-  exit 0
>X+  rc=1
>X+  rm -r $epdir
>X+  continue
>X fi
>X 
>X-rm -f $fixfil
>X-
>X-# Now add any missing fields, along with a description.
>X-
>X-$QUERY_PR --list-fields | while read field
>X-do
>X-    grep -i "^>${field}:" "$new" > /dev/null 2>&1
>X-    if [ $? != 0 ]
>X-    then
>X-	$QUERY_PR --field-flags "$field" | grep -i readonly > /dev/null 2>&1
>X-	if [ $? != 0 ]
>X-	then
>X-	    type="`$QUERY_PR --field-type $field`"
>X-	    case $type in
>X-		[Ee][Nn][Uu][Mm])
>X-		    values=`$QUERY_PR --valid-values $field | tr '\n' ' ' | sed 's/ *$//g; s/ / | /g;s/^/[ /;s/$/ ]/;`
>X-		    valslen=`echo "$values" | wc -c`
>X-		    if [ "$valslen" -gt 160 ]
>X-		    then
>X-			desc="<`$QUERY_PR --field-description $field` (one line)>";
>X-		    else
>X-			desc="<${values} (one line)>";
>X-		    fi
>X-		    dpat=`echo "$desc" | tr '][*+^$|\()&/' '............'`
>X-		    echo "/^>${field}:/ s/${dpat}//" >> $fixfil
>X-		    echo "/>${field}: ${desc}" >> $new;
>X-		    ;;
>X-		[Mm][Uu][Ll][Tt][Ii][Tt][Ee][Xx][Tt])
>X-		    desc="	<`$QUERY_PR --field-description $field` (multiple lines)>";
>X-		    dpat=`echo "$desc" | tr '][*+^$|\()&/' '............'`
>X-		    echo "s/^${dpat}//" >> $fixfil
>X-		    echo ">${field}:" >> $new;
>X-		    echo "$desc" >> $new;
>X-		    ;;
>X-		*)
>X-		    desc="<`$QUERY_PR --field-description $field` (one line)>"
>X-		    dpat=`echo "$desc" | tr '][*+^$|\()&/' '............'`
>X-		    echo "/^>${field}:/ s/${dpat}//" >> $fixfil
>X-		    echo ">${field}: ${desc}" >> $new
>X-		    ;;
>X-	    esac
>X-	else
>X-	    prevfld="$field";
>X-	fi
>X-    fi
>X-done
>X-
>X # here's where we actually call the editor.
>X cp $new $new.old
>X $VISUAL $new
>X if cmp -s $new.old $new ; then
>X   echo "edit-pr: PR not changed"
>X   $PR_EDIT --unlock $pr_id
>X-  exit 0
>X-fi
>X-
>X-if [ -f $fixfil ]
>X-then
>X-    sed -f $fixfil < $new > $newtmp
>X-    mv $newtmp $new
>X-    sed -f $fixfil < $new.old > $newtmp
>X-    mv $newtmp $new.old
>X-    rm -f $fixfil
>X+  rm -r $epdir
>X+  continue
>X fi
>X 
>X # error-check output by calling pr-edit --check; if mistakes exist,
>X@@ -233,7 +193,7 @@
>X         echo "PR $pr_id not updated: changed file is in $new.changed"
>X         mv $new $new.changed
>X 	$PR_EDIT --unlock $pr_id
>X-        exit 0
>X+        continue 2
>X         ;;
>X     esac
>X     $VISUAL $new
>X@@ -242,24 +202,37 @@
>X   fi
>X done
>X 
>X-exec 3<&0
>X-
>X #
>X # Find out what fields have changed; if the changed field requires a
>X # change reason, then ask about it.
>X #
>X-$LIBEXECDIR/gnats/diff-prs $new.old $new | while read field
>X+
>X+changed_fields=`$LIBEXECDIR/gnats/diff-prs $new.old $new`
>X+for field in $changed_fields
>X do
>X     flags=`$QUERY_PR --field-flags $field` || echo "edit-pr: Invalid field name $field" 1>&2;
>X 
>X     if echo "$flags" | grep -i "requirechangereason" > /dev/null 2>&1
>X     then
>X-        echo ">${field}-Changed-Why:" >> $change_msg;
>X-	echo "Why did the $field field change? (Ctrl-D to end)";
>X-	cat 0<&3  >> $change_msg;
>X+	$debug_print "Doing $field change."
>X+	echo ">$field-Changed-Why: " >> $change_msg
>X+	if [ -e $chng_msg ]; then
>X+	    echo "Re-use last message (y/n)?"
>X+	    read yesno
>X+	    if [ "$yesno" != "y" ]; then
>X+		sed "s/%%ITEM%%/$field/" $chng_tpl > $chng_msg
>X+	    fi
>X+	else
>X+	    sed "s/%%ITEM%%/$field/" $chng_tpl > $chng_msg
>X+	fi
>X+	$VISUAL $chng_msg
>X+	sed '/^GNATS:/d' $chng_msg >> $change_msg
>X     fi
>X done
>X 
>X+echo "" >> $change_msg
>X+echo "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=$pr_id" >> $change_msg
>X+
>X if [ -f $change_msg ]
>X then
>X     cat $change_msg >> $new
>X@@ -269,12 +242,12 @@
>X # Submit the changed PR.
>X #
>X while true; do
>X-    if $PR_EDIT --email-addr "$full_me" $pr_id < $new
>X+    if $PR_EDIT --email-addr "$me" $pr_id < $new
>X     then
>X 	echo "Edit successful"
>X 	# we need to unlock the PR
>X 	$PR_EDIT --unlock $pr_id
>X-	exit 0
>X+	break
>X     else
>X 	echo "Problems with edit submission."
>X     fi
>X@@ -284,9 +257,11 @@
>X 	case "$input" in
>X 	    a*)
>X 		echo "Cancelling edit.  Changed PR is in $new."
>X-		# we need to ulock the PR no matter what
>X+		# we need to unlock the PR no matter what
>X 		$PR_EDIT --unlock $pr_id
>X-		exit 1 ;;
>X+		keepnew=y
>X+		rc=1
>X+		break 2 ;;
>X 	    r*)
>X 		break ;;
>X 	     *)
>X@@ -296,6 +271,13 @@
>X     done
>X done
>X 
>X-rm -f $new
>X+rm -f $chng_msg $new.old $change_msg
>X+if [ "$keepnew" != "y" ]; then
>X+    rm -f $new
>X+    rmdir $epdir
>X+fi
>X+keepnew=
>X+
>X+done		# for pr_id in $prs
>X 
>X-exit 0
>X+exit $rc
>46d036fb2bf1b61a230d88b16f5bbb0d
>echo x - gnats4/pkg-plist
>sed 's/^X//' >gnats4/pkg-plist << '63335060dbaa03360a29adcc34f2e715'
>Xbin/edit-pr
>Xbin/getclose
>Xbin/install-sid
>Xbin/query-pr
>Xbin/send-pr
>X%%SERVER%%@unexec if cmp -s %D/etc/gnats/databases %D/etc/gnats/databases.default; then rm -f %D/etc/gnats/databases; fi
>X%%SERVER%%etc/gnats/databases.default
>X%%SERVER%%@exec [ -f %B/databases ] || cp %B/%f %B/databases
>X%%SERVER%%@unexec if cmp -s %D/etc/gnats/gnatsd.host_access %D/etc/gnats/gnatsd.host_access.default; then rm -f %D/etc/gnats/gnatsd.host_access; fi
>X%%SERVER%%etc/gnats/gnatsd.host_access.default
>X%%SERVER%%@exec [ -f %B/gnatsd.host_access ] || cp %B/%f %B/gnatsd.host_access
>Xetc/gnats/defaults/addresses
>Xetc/gnats/defaults/categories
>Xetc/gnats/defaults/classes
>Xetc/gnats/defaults/dbconfig
>Xetc/gnats/defaults/gnatsd.user_access
>Xetc/gnats/defaults/responsible
>Xetc/gnats/defaults/states
>Xetc/gnats/defaults/submitters
>Xetc/gnats/send-pr.conf
>X@dirrm etc/gnats/defaults
>X@dirrmtry etc/gnats
>X%%SERVER%%libexec/gnats/at-pr
>X%%SERVER%%libexec/gnats/check-db
>X%%SERVER%%libexec/gnats/delete-pr
>Xlibexec/gnats/diff-prs
>Xlibexec/gnats/file-pr
>X%%SERVER%%libexec/gnats/gen-index
>X%%SERVER%%libexec/gnats/gnats-pwconv
>X%%SERVER%%libexec/gnats/gnatsd
>Xlibexec/gnats/mail-agent
>X%%SERVER%%libexec/gnats/mail-query
>X%%SERVER%%libexec/gnats/mkcat
>X%%SERVER%%libexec/gnats/mkdb
>Xlibexec/gnats/pr-age
>Xlibexec/gnats/pr-edit
>X%%SERVER%%libexec/gnats/queue-pr
>X%%SERVER%%libexec/gnats/rmcat
>X@dirrm libexec/gnats
>X@exec mkdir -p %%GNATSDBDIR%%
>X@exec chown gnats %%GNATSDBDIR%%
>X@dirrmtry %%GNATSDBDIR%%
>X%%PORTDOCS%%%%DOCSDIR%%/NEWS
>X%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
>X%%PORTDOCS%%@dirrm %%DOCSDIR%%
>X%%EMACS_SITE_LISPDIR%%/gnats.el
>63335060dbaa03360a29adcc34f2e715
>echo x - gnats4/Makefile
>sed 's/^X//' >gnats4/Makefile << '719fbbe30e76c10775f34581273893c4'
>X# Created by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
>X# $FreeBSD: head/databases/gnats4/Makefile 360691 2014-07-04 23:48:56Z bapt $
>X
>XPORTNAME=		gnats
>XPORTVERSION=		4.1.0
>XPORTREVISION=		2
>XCATEGORIES=		databases devel
>XMASTER_SITES=		${MASTER_SITE_GNU}
>XMASTER_SITE_SUBDIR=	gnats
>X
>XMAINTAINER= portmaster@bsdforge.com
>XCOMMENT=		GNATS, the GNU Problem Report Management System
>X
>XGNU_CONFIGURE=		yes
>XUSES=			gmake makeinfo
>X
>XLATEST_LINK=		${PKGNAMEPREFIX}gnats4${PKGNAMESUFFIX}
>XCONFLICTS=		gnats-3.*
>X
>XPKGMESSAGE=		${WRKDIR}/pkg-message
>XPKGINSTALL=		${WRKDIR}/pkg-install
>X
>X.ifdef WANT_FREEFALL_CFG
>XEXTRA_PATCHES+=		${PATCHDIR}/extrapatch-*
>X
>XGNATSDBDIR=		${DATADIR}
>X
>XCONFIGURE_ARGS+=	--with-gnats-default-db=${GNATSDBDIR}/gnats-db
>X
>XWITH_SUBMITTER_ID=	current-users
>XWITH_ORGANIZATION=	FreeBSD
>XWITH_GNATSD_SERVICE=	support
>X.endif
>X
>XGNATSDBDIR?=		/var/db/gnats
>X
>XCONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
>X
>X.ifdef WITH_SUBMITTER_ID
>XCONFIGURE_ARGS+=	--with-submitter=${WITH_SUBMITTER_ID}
>X.endif
>X
>X.ifdef WITH_ORGANIZATION
>XCONFIGURE_ARGS+=	--with-organization=${WITH_ORGANIZATION:Q}
>X.endif
>X
>X.ifdef WITH_GNATSD_SERVICE
>XCONFIGURE_ARGS+=	--with-gnats-service=${WITH_GNATSD_SERVICE}
>X.endif
>X
>XPLIST_SUB=		GNATSDBDIR=${GNATSDBDIR}
>X
>XMAN1=			edit-pr.1 query-pr.1 send-pr.1
>XMAN5=			databases.5 dbconfig.5
>XMAN7=			gnats.7
>XMAN8=			delete-pr.8 getclose.8 file-pr.8 gen-index.8 gnatsd.8 \
>X				install-sid.8 mkcat.8 mkdb.8 pr-edit.8 queue-pr.8 rmcat.8
>XINFO=			gnats-faq gnats
>X
>XDOCFILES=		NEWS UPGRADING
>X
>X.ifdef WITH_EMACS_PORT
>XUSE_EMACS=	yes
>XEMACS_PORT_NAME=	${WITH_EMACS_PORT}
>XCONFIGURE_ARGS+=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
>X.else
>XPLIST_SUB+=		EMACS_SITE_LISPDIR="@comment "
>X.endif
>X
>X.ifdef CLIENT_ONLY
>XALL_TARGET=		all-tools
>XINSTALL_TARGET=		install-tools
>XPLIST_SUB+=		SERVER="@comment "
>XPKGNAMESUFFIX=		-client
>XCONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-4.*
>X.else
>XPLIST_SUB+=		SERVER=""
>XCONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-client-4.*
>X.endif
>X
>XOPTIONS_DEFINE=	DOCS
>X
>X#.include <bsd.port.pre.mk>
>X
>X.if ${OSVERSION} >= 1000000
>XIGNORE+=
>XIGNORE+= Is NOT clang friendly and will not build
>XIGNORE+= 
>XIGNORE+= on FreeBSD versions greater than 9
>XIGNORE+=
>XIGNORE+= this is VERY temporary, will resolve shortly
>X.endif
>X
>Xpre-everything::
>X.if !defined(PACKAGE_BUILDING) && !defined(WANT_FREEFALL_CFG)
>X	@${ECHO} "============================================================="
>X	@${ECHO}
>X	@${ECHO} "You can build ${PKGNAME} with the following options:"
>X	@${ECHO}
>X	@${ECHO} "WITH_SUBMITTER_ID=unknown        default submitter-id"
>X	@${ECHO} "WITH_ORGANIZATION='unknown'      default organization"
>X	@${ECHO} "WITH_GNATSD_SERVICE=support      default gnatsd port name"
>X	@${ECHO} "WITH_EMACS_PORT=emacs            with Emacs support"
>X	@${ECHO}
>X	@${ECHO} "============================================================="
>X	@${ECHO}
>X.endif
>X
>Xpre-configure:
>X	@${ECHO_CMD} 'RELEASE_TAG="\`uname -srm\`"' > ${WRKSRC}/release-info
>X
>Xpost-build:
>X	@for doc in pkg-message pkg-install; do \
>X		${SED} -e 's,%%PREFIX%%,${STAGEDIR}${PREFIX},g' \
>X			-e 's,%%GNATSDBDIR%%,${GNATSDBDIR},g' \
>X			${PKGDIR}/$${doc} >${WRKDIR}/$${doc}; \
>X	done
>X
>Xpre-install:
>X	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gnats
>X	@${SETENV} "PKG_PREFIX=${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>X
>Xpost-install:
>X.ifndef CLIENT_ONLY
>X	@for conf in databases gnatsd.host_access; do \
>X		[ -f ${PREFIX}/etc/gnats/$${conf} ] \
>X		|| ${CP} ${STAGEDIR}${PREFIX}/etc/gnats/$${conf}.default ${STAGEDIR}${PREFIX}/etc/gnats/$${conf}; \
>X	done
>X.endif
>X	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>X	@for doc in ${DOCFILES}; do \
>X		${INSTALL_DATA} ${WRKSRC}/$${doc} ${STAGEDIR}${DOCSDIR}; \
>X	done
>X	@${CAT} ${PKGMESSAGE}
>X
>X.include <bsd.port.mk>
>719fbbe30e76c10775f34581273893c4
>echo x - gnats4/distinfo
>sed 's/^X//' >gnats4/distinfo << '30f68fef50347b43889ec807e872ea12'
>XSHA256 (gnats-4.1.0.tar.gz) = 9e7264f2d049d29e048a9d0965bf5880f9ebd55f9d3feaba72d851db01960934
>XSIZE (gnats-4.1.0.tar.gz) = 1221364
>30f68fef50347b43889ec807e872ea12
>echo x - gnats4/pkg-descr
>sed 's/^X//' >gnats4/pkg-descr << '75b2957145727ff78ce331e70a24ec18'
>XGNU GNATS is a set of tools for tracking bugs reported by users to a
>Xcentral site.  It allows problem report management and communication
>Xwith users through various means, including e-mail, Web and a network
>Xdaemon.  GNATS stores all the information about problem reports in its
>Xdatabases, consisting of plain text files and it provides tools for
>Xquerying, editing and maintaining these databases.
>X
>XWWW: http://www.gnu.org/software/gnats/
>75b2957145727ff78ce331e70a24ec18
>echo x - gnats4/pkg-message
>sed 's/^X//' >gnats4/pkg-message << 'c0778869bc3e7da908ace5ac242f94d9'
>X************************************************************
>X
>XGNATS has been successfully installed.
>X
>XIf you want to run the GNATS server, enter
>X
>X  %%PREFIX%%/libexec/gnats/mkdb default
>X
>Xto create the default database and add
>X
>X  support	stream	tcp	nowait	gnats	%%PREFIX%%/libexec/gnats/gnatsd	gnatsd
>X
>Xto inetd.conf(5). Instructions to upgrade from a
>XGNATS 3.x database are in
>X
>X  %%PREFIX%%/share/doc/gnats/UPGRADING
>X
>XTry `man gnats', `info gnats' and the online manual at
>X
>X  http://www.gnu.org/software/gnats/gnats_toc.html
>X
>Xfor more information.
>X
>X************************************************************
>c0778869bc3e7da908ace5ac242f94d9
>echo x - gnats4/pkg-install
>sed 's/^X//' >gnats4/pkg-install << 'f67b3a1554f3a998b2cb27c89541ca31'
>X#!/bin/sh
>X#
>X# $FreeBSD: head/databases/gnats4/pkg-install 340719 2014-01-22 15:52:06Z mat $
>X#
>X
>XECHO_CMD=echo
>XGREP=/usr/bin/grep
>XPW=/usr/sbin/pw
>X
>XFTPUSERS=/etc/ftpusers
>XGNATSDBDIR=%%GNATSDBDIR%%
>X
>Xcase $2 in
>XPRE-INSTALL)
>X  if [ ! -x ${PW} ]; then
>X    ${ECHO_CMD} "Your system is missing the \`pw' command."
>X    exit 1
>X  fi
>X  if ${PW} usershow -n gnats >/dev/null 2>&1; then
>X    if [ "`pw usershow -n gnats | awk -F: '{print $9}'`" != "${GNATSDBDIR}" ]; then
>X      ${PW} usermod -n gnats -d "${GNATSDBDIR}" 2>/dev/null
>X      ${ECHO_CMD} "===>  Account \`gnats' updated."
>X    fi
>X  else
>X    if ${PW} useradd -n gnats -u 61 -g 1 -d "${GNATSDBDIR}" \
>X        -c "GNATS database owner" -h -; then
>X      ${GREP} -qs '^gnats$' ${FTPUSERS} || ${ECHO_CMD} gnats >> ${FTPUSERS}
>X      ${ECHO_CMD} "===>  Account \`gnats' created."
>X    else
>X      ${ECHO_CMD}
>X      ${ECHO_CMD} "The FreeBSD standard userid for gnats is 61, but this system"
>X      ${ECHO_CMD} "has already a different account with this userid:"
>X      ${ECHO_CMD}
>X      ${PW} usershow -u 61 -P
>X      ${ECHO_CMD}
>X      ${ECHO_CMD} "You can either delete this account (which may be dangerous) with"
>X      ${ECHO_CMD} "  ${PW} userdel -u 61"
>X      ${ECHO_CMD} "or add the gnats user with an other userid with"
>X      ${ECHO_CMD} "  ${PW} useradd -n gnats -g daemon \\"
>X      ${ECHO_CMD} "  -d ${GNATSDBDIR} -c 'GNATS database owner' -h -"        
>X      ${ECHO_CMD} "and retry installing this package"
>X      ${ECHO_CMD}
>X      exit 1
>X    fi
>X  fi
>X  ;;
>Xesac
>f67b3a1554f3a998b2cb27c89541ca31
>exit
>

Actions: View

Attachments on bug 192881: 146107