Hello community,
here is the log from the commit of package ed for openSUSE:Factory checked in at 2013-07-16 16:34:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ed (Old)
and /work/SRC/openSUSE:Factory/.ed.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ed"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ed/ed.changes 2013-06-17 14:45:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ed.new/ed.changes 2013-07-16 16:34:09.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jul 16 11:18:54 UTC 2013 - mvyskocil@suse.com
+
+- update to 1.9
+ + Testsuite no more feeds shell scripts to ed.
+ + "configure" now accepts options with a separate argument.
+
+-------------------------------------------------------------------
Old:
----
ed-1.8.tar.gz
ed-1.8.tar.gz.sig
New:
----
ed-1.9.tar.gz
ed-1.9.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ed.spec ++++++
--- /var/tmp/diff_new_pack.cA9BiD/_old 2013-07-16 16:34:09.000000000 +0200
+++ /var/tmp/diff_new_pack.cA9BiD/_new 2013-07-16 16:34:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: ed
-Version: 1.8
+Version: 1.9
Release: 0
Summary: GNU ed is a line-oriented text editor
License: GPL-3.0+ and LGPL-2.1+
++++++ ed-1.8.tar.gz -> ed-1.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/ChangeLog new/ed-1.9/ChangeLog
--- old/ed-1.8/ChangeLog 2013-04-23 12:52:37.000000000 +0200
+++ new/ed-1.9/ChangeLog 2013-06-18 12:27:02.000000000 +0200
@@ -1,3 +1,9 @@
+2013-06-18 Antonio Diaz Diaz
+
+ * Version 1.9 released.
+ * check.sh: Do not feed shell scripts to ed.
+ * configure: Options now accept a separate argument.
+
2013-04-23 Antonio Diaz Diaz
* Version 1.8 released.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/INSTALL new/ed-1.9/INSTALL
--- old/ed-1.8/INSTALL 2013-04-11 13:29:07.000000000 +0200
+++ new/ed-1.9/INSTALL 2013-06-06 16:02:17.000000000 +0200
@@ -1,7 +1,7 @@
Requirements
------------
You'll need a C compiler and a C library compatible with GNU libc.
-I use gcc 4.8.0 and 3.3.6, but the code should compile with any
+I use gcc 4.8.1 and 3.3.6, but the code should compile with any
standards compliant compiler.
Gcc is available at http://gcc.gnu.org.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/Makefile.in new/ed-1.9/Makefile.in
--- old/ed-1.8/Makefile.in 2012-10-09 17:17:27.000000000 +0200
+++ new/ed-1.9/Makefile.in 2013-05-26 20:07:01.000000000 +0200
@@ -7,8 +7,7 @@
INSTALL_DIR = $(INSTALL) -d -m 755
SHELL = /bin/sh
-objs = buffer.o carg_parser.o global.o io.o \
- main.o main_loop.o regex.o signal.o
+objs = buffer.o carg_parser.o global.o io.o main.o main_loop.o regex.o signal.o
.PHONY : all install install-bin install-info install-man install-strip \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/NEWS new/ed-1.9/NEWS
--- old/ed-1.8/NEWS 2013-02-09 00:05:27.000000000 +0100
+++ new/ed-1.9/NEWS 2013-05-21 00:30:00.000000000 +0200
@@ -1,4 +1,5 @@
-Changes in version 1.8:
+Changes in version 1.9:
-Ed now stops reading stdin when reaching real End Of File the first
-time. (Before it needed to reach EOF twice).
+Testsuite no more feeds shell scripts to ed.
+
+"configure" now accepts options with a separate argument.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/README new/ed-1.9/README
--- old/ed-1.8/README 2013-02-09 00:22:57.000000000 +0100
+++ new/ed-1.9/README 2013-05-20 23:56:46.000000000 +0200
@@ -126,9 +126,9 @@
.pr Result from a piped ed script.
.err Error - invalid ed commands that should generate an error
-The output of the tests is written to the files errs.ck, pipes.ck and
-scripts.ck. At the end of the tests, these files are grep'ed for error
-messages, which look like:
+The output of the tests is written to files with .o and .ro suffixes and
+compared with their corresponding .r and .pr result files.
+If any test fails, the error messages look like:
*** The script u.ed exited abnormally ***
or:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/configure new/ed-1.9/configure
--- old/ed-1.8/configure 2013-04-23 12:37:08.000000000 +0200
+++ new/ed-1.9/configure 2013-06-18 12:34:02.000000000 +0200
@@ -6,10 +6,8 @@
# This configure script is free software: you have unlimited permission
# to copy, distribute and modify it.
-args=
-no_create=
pkgname=ed
-pkgversion=1.8
+pkgversion=1.9
progname=ed
srctrigger=ed.h
@@ -30,18 +28,19 @@
LDFLAGS=
# checking whether we are using GNU C.
-if [ ! -x /bin/gcc ] &&
- [ ! -x /usr/bin/gcc ] &&
- [ ! -x /usr/local/bin/gcc ] ; then
+${CC} --version > /dev/null 2>&1
+if [ $? != 0 ] ; then
CC=cc
CFLAGS='-W -O2'
fi
# Loop over all args
-while [ -n "$1" ] ; do
+args=
+no_create=
+while [ $# != 0 ] ; do
# Get the first arg, and shuffle
- option=$1
+ option=$1 ; arg2=no
shift
# Add the argument quoted to args
@@ -77,6 +76,15 @@
--version | -V)
echo "Configure script for GNU ${pkgname} version ${pkgversion}"
exit 0 ;;
+ --srcdir) srcdir=$1 ; arg2=yes ;;
+ --prefix) prefix=$1 ; arg2=yes ;;
+ --exec-prefix) exec_prefix=$1 ; arg2=yes ;;
+ --bindir) bindir=$1 ; arg2=yes ;;
+ --datarootdir) datarootdir=$1 ; arg2=yes ;;
+ --infodir) infodir=$1 ; arg2=yes ;;
+ --mandir) mandir=$1 ; arg2=yes ;;
+ --program-prefix) program_prefix=$1 ; arg2=yes ;;
+
--srcdir=*) srcdir=${optarg} ;;
--prefix=*) prefix=${optarg} ;;
--exec-prefix=*) exec_prefix=${optarg} ;;
@@ -92,11 +100,22 @@
CFLAGS=*) CFLAGS=${optarg} ;;
LDFLAGS=*) LDFLAGS=${optarg} ;;
- --* | *=* | *-*-*) ;;
+ --*)
+ echo "configure: WARNING: unrecognized option: '${option}'" 1>&2 ;;
+ *=* | *-*-*) ;;
*)
- echo "configure: Unrecognized option: \"${option}\"; use --help for usage." 1>&2
+ echo "configure: unrecognized option: '${option}'" 1>&2
+ echo "Try 'configure --help' for more information." 1>&2
exit 1 ;;
esac
+
+ # Check if the option took a separate argument
+ if [ "${arg2}" = yes ] ; then
+ if [ $# != 0 ] ; then args="${args} \"$1\"" ; shift
+ else echo "configure: Missing argument to '${option}'" 1>&2
+ exit 1
+ fi
+ fi
done
# Find the source files, if location was not specified.
@@ -111,10 +130,8 @@
fi
if [ ! -r "${srcdir}/${srctrigger}" ] ; then
- exec 1>&2
- echo
- echo "configure: Can't find sources in ${srcdir} ${srcdirtext}"
- echo "configure: (At least ${srctrigger} is missing)."
+ echo "configure: Can't find sources in ${srcdir} ${srcdirtext}" 1>&2
+ echo "configure: (At least ${srctrigger} is missing)." 1>&2
exit 1
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/doc/ed.1 new/ed-1.9/doc/ed.1
--- old/ed-1.8/doc/ed.1 2013-04-23 12:37:12.000000000 +0200
+++ new/ed-1.9/doc/ed.1 2013-06-18 12:34:09.000000000 +0200
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH ED "1" "April 2013" "Ed 1.8" "User Commands"
+.TH ED "1" "June 2013" "Ed 1.9" "User Commands"
.SH NAME
Ed \- line-oriented text editor
.SH SYNOPSIS
@@ -35,6 +35,11 @@
.PP
Start edit by reading in 'file' if given.
If 'file' begins with a '!', read output of shell command.
+.PP
+Exit status: 0 for a normal exit, 1 for environmental problems (file
+not found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or
+invalid input file, 3 for an internal consistency error (eg, bug) which
+caused ed to panic.
.SH "REPORTING BUGS"
Report bugs to .
.br
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/doc/ed.info new/ed-1.9/doc/ed.info
--- old/ed-1.8/doc/ed.info 2013-04-23 12:34:00.000000000 +0200
+++ new/ed-1.9/doc/ed.info 2013-06-18 12:27:04.000000000 +0200
@@ -19,7 +19,7 @@
The GNU ed line editor
**********************
-This manual is for GNU ed (version 1.8, 23 April 2013).
+This manual is for GNU ed (version 1.9, 18 June 2013).
GNU ed is a line-oriented text editor. It is used to create, display,
@@ -905,7 +905,7 @@
modified buffer results in an error. If the command is entered a second
time, it succeeds, but any changes to the buffer are lost.
- `ed' exits with 0 if no errors occurred; otherwise >0.
+ Exit status: 0 if no errors occurred; otherwise >0.
File: ed.info, Node: Problems, Next: GNU Free Documentation License, Prev: Diagnostics, Up: Top
@@ -1412,16 +1412,16 @@
Tag Table:
Node: Top574
-Node: Overview2258
-Node: Introduction to Line Editing4315
-Node: Invoking Ed11558
-Node: Line Addressing13359
-Node: Regular Expressions16436
-Node: Commands21780
-Node: Limitations32925
-Node: Diagnostics33566
-Node: Problems34270
-Node: GNU Free Documentation License34803
+Node: Overview2257
+Node: Introduction to Line Editing4314
+Node: Invoking Ed11557
+Node: Line Addressing13358
+Node: Regular Expressions16435
+Node: Commands21779
+Node: Limitations32924
+Node: Diagnostics33565
+Node: Problems34266
+Node: GNU Free Documentation License34799
End Tag Table
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/doc/ed.texinfo new/ed-1.9/doc/ed.texinfo
--- old/ed-1.8/doc/ed.texinfo 2013-04-23 12:33:58.000000000 +0200
+++ new/ed-1.9/doc/ed.texinfo 2013-06-18 12:27:02.000000000 +0200
@@ -6,8 +6,8 @@
@finalout
@c %**end of header
-@set UPDATED 23 April 2013
-@set VERSION 1.8
+@set UPDATED 18 June 2013
+@set VERSION 1.9
@dircategory Basics
@direntry
@@ -982,7 +982,7 @@
modified buffer results in an error. If the command is entered a second
time, it succeeds, but any changes to the buffer are lost.
-@command{ed} exits with 0 if no errors occurred; otherwise >0.
+Exit status: 0 if no errors occurred; otherwise >0.
@node Problems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/main.c new/ed-1.9/main.c
--- old/ed-1.8/main.c 2013-02-09 00:29:00.000000000 +0100
+++ new/ed-1.9/main.c 2013-04-30 12:33:27.000000000 +0200
@@ -16,7 +16,7 @@
along with this program. If not, see http://www.gnu.org/licenses/.
*/
/*
- Return values: 0 for a normal exit, 1 for environmental problems
+ Exit status: 0 for a normal exit, 1 for environmental problems
(file not found, invalid flags, I/O errors, etc), 2 to indicate a
corrupt or invalid input file, 3 for an internal consistency error
(eg, bug) which caused ed to panic.
@@ -73,6 +73,10 @@
" -v, --verbose be verbose\n"
"Start edit by reading in 'file' if given.\n"
"If 'file' begins with a '!', read output of shell command.\n"
+ "\nExit status: 0 for a normal exit, 1 for environmental problems (file\n"
+ "not found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or\n"
+ "invalid input file, 3 for an internal consistency error (eg, bug) which\n"
+ "caused ed to panic.\n"
"\nReport bugs to .\n"
"Ed home page: http://www.gnu.org/software/ed/ed.html\n"
"General help using GNU software: http://www.gnu.org/gethelp\n" );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/testsuite/check.sh new/ed-1.9/testsuite/check.sh
--- old/ed-1.8/testsuite/check.sh 2013-02-09 00:22:57.000000000 +0100
+++ new/ed-1.9/testsuite/check.sh 2013-06-18 11:45:35.000000000 +0200
@@ -28,29 +28,21 @@
for i in *.t ; do
base=`echo "$i" | sed 's/\.t$//'`
(
- echo "#! /bin/sh"
- echo "${ED} -s <<'EOT'"
echo H
echo "r ${testdir}/${base}.d"
cat "$i"
echo "w ${base}.o"
- echo EOT
) > "${objdir}/tmp/${base}.ed"
- chmod u+x "${objdir}/tmp/${base}.ed"
done
for i in *.err ; do
base=`echo "$i" | sed 's/\.err$//'`
(
- echo "#! /bin/sh -"
- echo "${ED} -s <<'EOT'"
echo H
echo "r ${testdir}/${base}.err"
cat "$i"
echo "w ${base}.ro"
- echo EOT
) > "${objdir}/tmp/${base}.red"
- chmod u+x "${objdir}/tmp/${base}.red"
done
@@ -66,43 +58,44 @@
# Run the *.red scripts first, since these don't generate output;
# they exit with non-zero status
for i in *.red ; do
- echo "$i"
- if ./"$i" ; then
+ if "${ED}" -s < "$i" > /dev/null 2>&1 ; then
echo "*** The script $i exited abnormally ***"
+ fail=127
fi
-done > errs.ck 2>&1
+done
# Run error scripts again as pipes - these should generate output and
# exit with error (>0) status.
for i in *.red ; do
base=`echo "$i" | sed 's/\.red$//'`
- if cat ${base}.red | "${ED}" -s ; then
+ if cat ${base}.red | "${ED}" -s > /dev/null 2>&1 ; then
echo "*** The piped script $i exited abnormally ***"
+ fail=127
else
if cmp -s ${base}.ro "${testdir}"/${base}.pr ; then
true
else
echo "*** Output ${base}.ro of piped script $i is incorrect ***"
+ fail=127
fi
fi
-done > pipes.ck 2>&1
+done
-# Run the remainding scripts; they exit with zero status
+# Run the remaining scripts; they exit with zero status
for i in *.ed ; do
base=`echo "$i" | sed 's/\.ed$//'`
- if ./${base}.ed ; then
+ if "${ED}" -s < ${base}.ed > /dev/null 2>&1 ; then
if cmp -s ${base}.o "${testdir}"/${base}.r ; then
true
else
echo "*** Output ${base}.o of script $i is incorrect ***"
+ fail=127
fi
else
echo "*** The script $i exited abnormally ***"
+ fail=127
fi
-done > scripts.ck 2>&1
-
-grep '\*\*\*' *.ck | sed 's/^[^*]*//'
-grep '\*\*\*' *.ck > /dev/null && fail=127
+done
if [ ${fail} = 0 ] ; then
echo "tests completed successfully."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/testsuite/e1.r new/ed-1.9/testsuite/e1.r
--- old/ed-1.8/testsuite/e1.r 2010-07-20 13:23:37.000000000 +0200
+++ new/ed-1.9/testsuite/e1.r 2013-05-20 14:02:16.000000000 +0200
@@ -1,5 +1,4 @@
3d
e e1.ed
-1;/H/+d
+1,2d
w e1.o
-EOT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/testsuite/e1.t new/ed-1.9/testsuite/e1.t
--- old/ed-1.8/testsuite/e1.t 2010-07-20 13:20:39.000000000 +0200
+++ new/ed-1.9/testsuite/e1.t 2013-05-20 14:02:16.000000000 +0200
@@ -1,3 +1,3 @@
3d
e e1.ed
-1;/H/+d
+1,2d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.8/testsuite/r3.r new/ed-1.9/testsuite/r3.r
--- old/ed-1.8/testsuite/r3.r 1994-11-19 12:26:29.000000000 +0100
+++ new/ed-1.9/testsuite/r3.r 2013-05-20 13:55:10.000000000 +0200
@@ -1,4 +1,3 @@
r r3.ed
1;/H/+d
w r3.o
-EOT
N§²æìržyéZ)z{.±ç(húéì¹»®&Þ¢§²ë¢ž¢¶v+b¢v¥rŠjwlzf¢^ˬyÊ&+~
éi¢§²ë¢ž