Date: Sunday, November 26, 2017 @ 00:51:49 Author: kkeen Revision: 268496
upgpkg: fortune-mod 1.99.5-1 Modified: fortune-mod/trunk/PKGBUILD Deleted: fortune-mod/trunk/01_all_fortune_all-fix.patch fortune-mod/trunk/LICENSE ------------------------------+ 01_all_fortune_all-fix.patch | 21 --------------------- LICENSE | 35 ----------------------------------- PKGBUILD | 20 ++++++++++---------- 3 files changed, 10 insertions(+), 66 deletions(-) Deleted: 01_all_fortune_all-fix.patch =================================================================== --- 01_all_fortune_all-fix.patch 2017-11-26 00:26:49 UTC (rev 268495) +++ 01_all_fortune_all-fix.patch 2017-11-26 00:51:49 UTC (rev 268496) @@ -1,21 +0,0 @@ ---- fortune/fortune.c.old 2006-03-11 15:33:14.000000000 +0100 -+++ fortune/fortune.c 2006-03-11 15:43:16.000000000 +0100 -@@ -974,7 +974,7 @@ - if (!ret) - ret=add_file(percent, fullpathname, NULL, &File_list, - &File_tail, NULL); -- if ( (!ret && fullpathname != locpathname) || strcmp(sp, "all") == 0 ) -+ if (!ret && strncmp(fullpathname, locpathname, sizeof(fullpathname))) - ret=add_file(percent, locpathname, NULL, &File_list, - &File_tail, NULL); - -@@ -985,7 +985,8 @@ - } - if (!ret) - return FALSE; -- -+ if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) && strcmp(sp, "all") == 0) -+ add_file(percent, locpathname, NULL, &File_list, &File_tail, NULL); - } - else - if (!add_file(percent, fullpathname, NULL, &File_list, Deleted: LICENSE =================================================================== --- LICENSE 2017-11-26 00:26:49 UTC (rev 268495) +++ LICENSE 2017-11-26 00:51:49 UTC (rev 268496) @@ -1,35 +0,0 @@ -/*- - * Copyright (c) 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ken Arnold. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-11-26 00:26:49 UTC (rev 268495) +++ PKGBUILD 2017-11-26 00:51:49 UTC (rev 268496) @@ -3,21 +3,21 @@ # Contributor: Dale Blount <archli...@dale.us> pkgname=fortune-mod -pkgver=1.99.1 -pkgrel=6 +pkgver=1.99.5 +pkgrel=1 pkgdesc="The Fortune Cookie Program from BSD games" arch=('x86_64') -url="http://www.redellipse.net/code/fortune" +url="http://www.shlomifish.org/open-source/projects/fortune-mod/" license=('BSD') depends=('recode') -source=(https://sources.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch) -md5sums=('f208805b3b712e32997d7667e0ec52d8' - '0217481ae93971296cfb7872157cabb7' +source=("https://github.com/shlomif/fortune-mod/archive/fortune-mod-$pkgver.tar.gz" + 01_all_fortune_all-fix.patch) +md5sums=('62abb4b368873a27f23ff1f9c386605e' 'e85b073f16dc6f0e8f0ed90044797aa3') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p0 < ../01_all_fortune_all-fix.patch + cd "$srcdir/fortune-mod-fortune-mod-$pkgver/fortune-mod" + #patch -p0 < "$srcdir/01_all_fortune_all-fix.patch" make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL' \ COOKIEDIR=/usr/share/fortune \ LOCALDIR=/usr/local/share/fortune all fortune/fortune.man @@ -24,7 +24,7 @@ } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/fortune-mod-fortune-mod-$pkgver/fortune-mod" make FORTDIR="$pkgdir"/usr/bin \ COOKIEDIR="$pkgdir"/usr/share/fortune \ BINDIR="$pkgdir"/usr/bin \ @@ -32,5 +32,5 @@ FORTMANDIR="$pkgdir"/usr/share/man/man6 install rm "$pkgdir"/usr/share/fortune/*.u8 rm "$pkgdir"/usr/share/fortune/off/*.u8 - install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + install -D -m644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" }