rpms/cvs/devel cvs-1.11.23-getline64.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 cvs-1.11.22-cvspass.patch, 1.1, 1.2 cvs.spec, 1.59, 1.60 sources, 1.13, 1.14
Jiří Moskovčák (jmoskovc)
fedora-extras-commits at redhat.com
Tue Jun 3 17:24:49 UTC 2008
Author: jmoskovc
Update of /cvs/extras/rpms/cvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32540
Modified Files:
.cvsignore cvs-1.11.22-cvspass.patch cvs.spec sources
Added Files:
cvs-1.11.23-getline64.patch
Log Message:
New version, fixed build problem on x86_64(rhbz#449424)
cvs-1.11.23-getline64.patch:
--- NEW FILE cvs-1.11.23-getline64.patch ---
--- cvs-1.11.23/lib/getline.c 2005-04-04 22:46:05.000000000 +0200
+++ cvs-1.11.23/lib/getline.c.old 2008-06-03 19:06:25.000000000 +0200
@@ -154,7 +154,7 @@
return ret;
}
-int
+ssize_t
getline (lineptr, n, stream)
char **lineptr;
size_t *n;
@@ -163,7 +163,7 @@
return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
}
-int
+ssize_t
getline_safe (lineptr, n, stream, limit)
char **lineptr;
size_t *n;
--- cvs-1.11.23/lib/getline.h 2005-04-04 22:46:05.000000000 +0200
+++ cvs-1.11.23/lib/getline.h.old 2008-06-03 19:06:27.000000000 +0200
@@ -11,9 +11,9 @@
#define GETLINE_NO_LIMIT -1
-int
+ssize_t
getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
-int
+ssize_t
getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
int limit));
int
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Jun 2006 08:08:31 -0000 1.13
+++ .cvsignore 3 Jun 2008 17:24:07 -0000 1.14
@@ -1,4 +1 @@
-cvs-1.11.17.tar.bz2
-cvs-1.11.19.tar.bz2
-cvs-1.11.21.tar.bz2
-cvs-1.11.22.tar.bz2
+cvs-1.11.23.tar.bz2
cvs-1.11.22-cvspass.patch:
Index: cvs-1.11.22-cvspass.patch
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs-1.11.22-cvspass.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvs-1.11.22-cvspass.patch 12 Jun 2006 08:08:32 -0000 1.1
+++ cvs-1.11.22-cvspass.patch 3 Jun 2008 17:24:07 -0000 1.2
@@ -27,9 +27,9 @@
error (0, errno, "warning: failed to open %s for reading", passfile);
goto process;
}
---- cvs-1.11.22/src/sanity.sh.cvspass 2006-06-09 04:09:41.000000000 +0200
-+++ cvs-1.11.22/src/sanity.sh 2006-06-12 09:54:44.000000000 +0200
-@@ -15183,6 +15183,7 @@
+--- cvs-1.11.23/src/sanity.sh 2008-06-03 12:32:14.000000000 +0200
++++ cvs-1.11.23/src/sanity.sh.new 2008-06-03 12:32:20.000000000 +0200
+@@ -15594,6 +15594,7 @@
revision 1\.1
date: [0-9/]* [0-9:]*; author: ${username}; state: Exp;
branches: 1\.1\.2;
@@ -37,7 +37,7 @@
xCVS: ----------------------------------------------------------------------
xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically
xCVS:
-@@ -15194,6 +15195,7 @@
+@@ -15605,6 +15606,7 @@
----------------------------
revision 1\.1\.2\.1
date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; lines: ${PLUS}1 -0
@@ -45,7 +45,7 @@
xCVS: ----------------------------------------------------------------------
xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically
xCVS:
-@@ -15221,6 +15223,7 @@
+@@ -15626,6 +15628,7 @@
revision 1\.1
date: [0-9/]* [0-9:]*; author: ${username}; state: Exp;
branches: 1\.1\.2;
@@ -53,27 +53,11 @@
xCVS: ----------------------------------------------------------------------
xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically
xCVS:
-@@ -15232,6 +15235,7 @@
+@@ -15637,6 +15640,7 @@
----------------------------
revision 1\.1\.2\.1
date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; lines: ${PLUS}1 -0
+x
xCVS: ----------------------------------------------------------------------
xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically
- xCVS:
-@@ -15253,6 +15257,7 @@
- revision 1\.1
- date: [0-9/]* [0-9:]*; author: ${username}; state: Exp;
- branches: 1\.1\.2;
-+x
- xCVS: ----------------------------------------------------------------------
- xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically
- xCVS:
-@@ -15264,6 +15269,7 @@
- ----------------------------
- revision 1\.1\.2\.1
- date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; lines: ${PLUS}1 -0
-+x
- xCVS: ----------------------------------------------------------------------
- xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically
- xCVS:
+ xCVS:
\ No newline at end of file
Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- cvs.spec 19 Feb 2008 06:29:05 -0000 1.59
+++ cvs.spec 3 Jun 2008 17:24:07 -0000 1.60
@@ -5,8 +5,8 @@
Summary: A version control system
Name: cvs
-Version: 1.11.22
-Release: 13%{?dist}
+Version: 1.11.23
+Release: 1%{?dist}
License: GPL
Group: Development/Tools
Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -41,9 +41,10 @@
Patch13: cvs-1.11.21-diff.patch
Patch14: cvs-1.11.21-diff-kk.patch
Patch15: cvs-1.11.21-sort.patch
-Patch16: cvs-1.11.22-free.patch
+#Patch16: cvs-1.11.22-free.patch //unneeded
Patch17: cvs-1.11.22-ipv6-proxy.patch
-Patch18: cvs-1.11.22-diff-rm.patch
+#Patch18: cvs-1.11.22-diff-rm.patch
+Patch19: cvs-1.11.23-getline64.patch
%description
@@ -81,9 +82,10 @@
%patch13 -p1 -b .diff
%patch14 -p1 -b .diff-kk
%patch15 -p1 -b .env
-%patch16 -p1 -b .free
+#%patch16 -p1 -b .free
%patch17 -p1 -b .ipv6
-%patch18 -p1 -b .diff-rm
+#%patch18 -p1 -b .diff-rm
+%patch19 -p1 -b getline64
# Apply a patch to the generated files, OR
# run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
@@ -161,6 +163,12 @@
%{_sysconfdir}/profile.d/*
%changelog
+* Tue Jun 3 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.11.23.1
+- updated to new version 1.11.23
+- fixed build on x86_64
+- rewritten sanity.sh patch to match current version
+- Resolves: #449424
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.11.22-13
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 12 Jun 2006 08:08:43 -0000 1.13
+++ sources 3 Jun 2008 17:24:07 -0000 1.14
@@ -1 +1 @@
-f24043a640509aff1aa28871dd345762 cvs-1.11.22.tar.bz2
+0213ea514e231559d6ff8f80a34117f0 cvs-1.11.23.tar.bz2
More information about the fedora-extras-commits
mailing list