Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / cvs
Commits: e3ce2da5 by fenugrec at 2024-11-28T10:38:42-05:00 Move 'patch' commands to the prepare() block. Otherwise 'makepkg -e' is unusable - - - - - 97db7712 by fenugrec at 2024-11-28T15:39:24-05:00 Add C99 fixes from redhat - gets() is deprecated and should not be used - SIG_deregister was missing a prototype Source of patch: https://src.fedoraproject.org/rpms/cvs/blob/rawhide/f/cvs-1.11.23-c99.patch - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + cvs-1.11.23-c99.patch Changes: ===================================== .SRCINFO ===================================== @@ -20,6 +20,7 @@ pkgbase = cvs source = cvs-1.11.21-diff-kk.patch source = cvs-1.11.21-diff.patch source = cvs-1.11.21-sort.patch + source = cvs-1.11.23-c99.patch source = cvs-1.11.23-cve-2010-3846.patch source = cvs-1.11.23-cvspass.patch source = cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch @@ -39,6 +40,7 @@ pkgbase = cvs b2sums = 3a9fe195c03471049874d6a97353c30aa1f0ec40504d0531dea332f731c3d5034548c60bfd5b09f33a72fe9bb72035e5f1c2d8a02b0908c8b6284b69b75b769d b2sums = 0e58ecc574cf47b2e2b5bc7da105a3efd8c718cfa58e9acfccc0f1d8d7ce0cc25bac00b750ac89011448da60358fae4c0b84e6310453a297c54399e6f6ca1008 b2sums = 7f617e1de7d8b9ffcc5ca6c54824765105b7a3300ba313e46eaef5e75dd31df461bac6699f33e075048c14d1597e15c8627adef41de10e24be382e8b3c689f96 + b2sums = 39952f0ad9c1e3b5d955043243a95b6b0274359905c509b01ffb18125d132c8932c60889f5732c668b5ffeb18f53feacbf068909aab1696cbd7b20c8303ba74e b2sums = d2c002046297c4bfea3655d1e11a7cca1265542f5e4832707f1a0206e4da5b406af1fae549b53487ef8f9c2c5f288bfeffc8829d3626eff9caf2ab0fd565529c b2sums = 16f49030e303375a59e5dc8eddc085453e7a0901848de2532e53375c7da9fa68d6724f8f610b19f4e76d1178f2b2305465f408974f536e77850dadf392b672f7 b2sums = 8406bdc0a0dc948bfe73fed36892bc3e7bb517557854dbde3924600ce5cf8cb703cca2c1d9d469d909fb94cc0bca52536d4bccbc22a28a9acb0080633ce542e2 ===================================== PKGBUILD ===================================== @@ -27,6 +27,7 @@ source=("https://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$_archive.tar.bz2 cvs-1.11.21-diff-kk.patch cvs-1.11.21-diff.patch cvs-1.11.21-sort.patch + cvs-1.11.23-c99.patch cvs-1.11.23-cve-2010-3846.patch cvs-1.11.23-cvspass.patch cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch @@ -46,6 +47,7 @@ b2sums=('73c01741793c74106be076c9f931a90e0eb8630e80375762d5add70d940a81837b4690e '3a9fe195c03471049874d6a97353c30aa1f0ec40504d0531dea332f731c3d5034548c60bfd5b09f33a72fe9bb72035e5f1c2d8a02b0908c8b6284b69b75b769d' '0e58ecc574cf47b2e2b5bc7da105a3efd8c718cfa58e9acfccc0f1d8d7ce0cc25bac00b750ac89011448da60358fae4c0b84e6310453a297c54399e6f6ca1008' '7f617e1de7d8b9ffcc5ca6c54824765105b7a3300ba313e46eaef5e75dd31df461bac6699f33e075048c14d1597e15c8627adef41de10e24be382e8b3c689f96' + '39952f0ad9c1e3b5d955043243a95b6b0274359905c509b01ffb18125d132c8932c60889f5732c668b5ffeb18f53feacbf068909aab1696cbd7b20c8303ba74e' 'd2c002046297c4bfea3655d1e11a7cca1265542f5e4832707f1a0206e4da5b406af1fae549b53487ef8f9c2c5f288bfeffc8829d3626eff9caf2ab0fd565529c' '16f49030e303375a59e5dc8eddc085453e7a0901848de2532e53375c7da9fa68d6724f8f610b19f4e76d1178f2b2305465f408974f536e77850dadf392b672f7' '8406bdc0a0dc948bfe73fed36892bc3e7bb517557854dbde3924600ce5cf8cb703cca2c1d9d469d909fb94cc0bca52536d4bccbc22a28a9acb0080633ce542e2' @@ -55,9 +57,8 @@ b2sums=('73c01741793c74106be076c9f931a90e0eb8630e80375762d5add70d940a81837b4690e '6502722ec9f3ea711d0c3ce3cc525bbd930cd64d9e1b9be1ef3b5a768cd57d98c29560c097814e5ac9f4c1e09b804b3cfcfe580d63196deadf0e17cf0786fc66' 'e4a17d12810a3b73dc4687c9935e2d2664d3c944e55c9e1fa9102ec3c37b0a1e39c76c75b5ed233f73852bca0ca3fda878ae628140c0296781a157e6b0633fb6') -build() { +prepare() { cd $pkgname-$pkgver - unset EDITOR VISUAL patch -Np1 -i ../cvs-1.11.19-extzlib.patch patch -Np1 -i ../cvs-1.11.23-getline64.patch # CVE-2010-3864, https://www.redhat.com/security/data/cve/CVE-2010-3846.html @@ -77,6 +78,12 @@ build() { patch -Np1 -i ../cvs-1.11.23-Pass-compilation-with-Wformat-security.patch patch -Np1 -i ../cvs-1.11.23-remove_undefined_date_from_cvs_1_header.patch patch -Np1 -i ../cvs-1.11.23-sanity.patch + patch -Np1 -i ../cvs-1.11.23-c99.patch +} + +build() { + cd $pkgname-$pkgver + unset EDITOR VISUAL sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in find . -type f -name Makefile.am -exec sed -i -e 's/^INCLUDES/AM_CPPFLAGS/' {} + touch vi ===================================== cvs-1.11.23-c99.patch ===================================== @@ -0,0 +1,40 @@ +Downstream-only patch. CVS hasn't had a release since 2008. + +diff --git a/lib/getdate.c b/lib/getdate.c +index 5180358c85f8a050..18a6ce0416aa188b 100644 +--- a/lib/getdate.c ++++ b/lib/getdate.c +@@ -1019,7 +1019,7 @@ main(ac, av) + + (void)printf("Enter date, or blank line to exit.\n\t> "); + (void)fflush(stdout); +- while (gets(buff) && buff[0]) { ++ while (fgets(buff, sizeof(buff) - 1, stdin) && buff[0]) { + d = get_date(buff, (struct timeb *)NULL); + if (d == -1) + (void)printf("Bad format - couldn't convert.\n"); +diff --git a/lib/getdate.y b/lib/getdate.y +index 0e128d74ef609818..007318cd0aef2623 100644 +--- a/lib/getdate.y ++++ b/lib/getdate.y +@@ -1015,7 +1015,7 @@ main(ac, av) + + (void)printf("Enter date, or blank line to exit.\n\t> "); + (void)fflush(stdout); +- while (gets(buff) && buff[0]) { ++ while (fgets(buff, sizeof(buff) - 1, stdin) && buff[0]) { + d = get_date(buff, (struct timeb *)NULL); + if (d == -1) + (void)printf("Bad format - couldn't convert.\n"); +diff --git a/src/cvs.h b/src/cvs.h +index a7f4b2f6bd6c67fb..cd6ffc9bbd7859aa 100644 +--- a/src/cvs.h ++++ b/src/cvs.h +@@ -486,6 +486,7 @@ extern int parse_config PROTO ((char *)); + + typedef RETSIGTYPE (*SIGCLEANUPPROC) PROTO(()); + int SIG_register PROTO((int sig, SIGCLEANUPPROC sigcleanup)); ++int SIG_deregister PROTO((int sig, SIGCLEANUPPROC sigcleanup)); + int isdir PROTO((const char *file)); + int isfile PROTO((const char *file)); + int islink PROTO((const char *file)); View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/cvs/-/compare/7b567cd7004a0963e0fac19732201efd54cb0192...97db771274a4308703caa7e3701d346da26e4472 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/cvs/-/compare/7b567cd7004a0963e0fac19732201efd54cb0192...97db771274a4308703caa7e3701d346da26e4472 You're receiving this email because of your account on gitlab.archlinux.org.
