commit: 6a7efd8a60449acf31d09beb2c28eb15a2560538 parent: 7b937baad677846137a997fe21dd6824731a3627 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Thu, 15 Dec 2016 04:58:42 +0100 app-misc/datefudge: EAPI-6 & fix #602714Diffstat:
| A | app-misc/datefudge/ChangeLog | 64 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | app-misc/datefudge/ChangeLog-2015 | 89 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | app-misc/datefudge/Manifest | 7 | +++++++ |
| A | app-misc/datefudge/datefudge-1.17-r1.ebuild | 38 | ++++++++++++++++++++++++++++++++++++++ |
| D | app-misc/datefudge/datefudge-1.17.ebuild | 36 | ------------------------------------ |
| A | app-misc/datefudge/files/datefudge-1.17-bsd.patch | 58 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | app-misc/datefudge/files/datefudge-alt-libc.patch | 42 | ++++++++++++++++++++++++++++++++++++++++++ |
| A | app-misc/datefudge/metadata.xml | 4 | ++++ |
8 files changed, 302 insertions(+), 36 deletions(-)
diff --git a/app-misc/datefudge/ChangeLog b/app-misc/datefudge/ChangeLog @@ -0,0 +1,64 @@ +# ChangeLog for app-misc/datefudge +# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 +# (auto-generated from git log) + +*datefudge-1.17 (09 Aug 2015) + + 09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +datefudge-1.17.ebuild, + +files/datefudge-1.17-bsd.patch, +metadata.xml: + proj/gentoo: Initial commit + + This commit represents a new era for Gentoo: + Storing the gentoo-x86 tree in Git, as converted from CVS. + + This commit is the start of the NEW history. + Any historical data is intended to be grafted onto this point. + + Creation process: + 1. Take final CVS checkout snapshot + 2. Remove ALL ChangeLog* files + 3. Transform all Manifests to thin + 4. Remove empty Manifests + 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ + 5.1. Do not touch files with -kb/-ko keyword flags. + + Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration + tests + X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this + project + X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo + developer, wrote Git features for the migration + X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve + cvs2svn + X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts + X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 + work in migration + X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging + X-Thanks: All of other Gentoo developers - many ideas and lots of paint on + the bikeshed + + 24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: + Use https by default + + Convert all URLs for sites supporting encrypted connections from http to + https + + Signed-off-by: Justin Lecher <jlec@gentoo.org> + + 24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml: + Revert DOCTYPE SYSTEM https changes in metadata.xml + + repoman does not yet accept the https version. + This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. + + Bug: https://bugs.gentoo.org/552720 + + 24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml: + Set appropriate maintainer types in metadata.xml (GLEP 67) + + 06 Aug 2016; Pacho Ramos <pacho@gentoo.org> metadata.xml: + Cleanup per bug #131259 + + Package-Manager: portage-2.3.0 + diff --git a/app-misc/datefudge/ChangeLog-2015 b/app-misc/datefudge/ChangeLog-2015 @@ -0,0 +1,89 @@ +# ChangeLog for app-misc/datefudge +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/datefudge/ChangeLog,v 1.26 2015/04/17 00:29:29 mrueg Exp $ + + 17 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -datefudge-1.14.ebuild: + Remove old. + + 10 Jun 2014; Mike Frysinger <vapier@gentoo.org> datefudge-1.17.ebuild: + Add arm64 love. + + 10 May 2012; Alexis Ballier <aballier@gentoo.org> datefudge-1.17.ebuild: + apply the bsd patch before sedding the makefile otherwise it does not apply + on amd64-fbsd and keyword ~amd64-fbsd + + 31 Mar 2012; Raúl Porcel <armin76@gentoo.org> datefudge-1.17.ebuild: + alpha/ia64/m68k/s390/sh/sparc stable wrt #405123 + + 12 Mar 2012; Markus Meier <maekke@gentoo.org> datefudge-1.17.ebuild: + arm stable, bug #405123 + + 09 Mar 2012; Brent Baude <ranger@gentoo.org> datefudge-1.17.ebuild: + Marking datefudge-1.17 ppc64 for bug 405123 + + 08 Mar 2012; Naohiro Aota <naota@gentoo.org> +files/datefudge-1.17-bsd.patch, + datefudge-1.17.ebuild: + Add ~x86-fbsd. Add patch to deal with FreeBSD. #326999 + + 06 Mar 2012; Brent Baude <ranger@gentoo.org> datefudge-1.17.ebuild: + Marking datefudge-1.17 ppc for bug 405123 + + 24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> datefudge-1.17.ebuild: + x86 stable wrt bug #405123 + + 21 Feb 2012; Jeroen Roovers <jer@gentoo.org> datefudge-1.17.ebuild: + Stable for HPPA (bug #405123). + + 21 Feb 2012; Agostino Sarubbo <ago@gentoo.org> datefudge-1.17.ebuild: + Stable for amd64, wrt bug #405123 + + 21 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> datefudge-1.17.ebuild: + Use full compiler name wrt #403117 by kensington + +*datefudge-1.17 (20 Sep 2011) + + 20 Sep 2011; Jeremy Olexa <darkside@gentoo.org> +datefudge-1.17.ebuild: + Version bump from upstream, migrate to EAPI4, add prefix mods from bug 383749 + + 22 Feb 2011; nixnut <nixnut@gentoo.org> datefudge-1.14.ebuild: + ppc stable #352744 + + 30 Jan 2011; Raúl Porcel <armin76@gentoo.org> datefudge-1.14.ebuild: + alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #352744 + + 28 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> + datefudge-1.14.ebuild: + x86 stable wrt bug #352744 + + 25 Jan 2011; Jeroen Roovers <jer@gentoo.org> datefudge-1.14.ebuild: + Stable for HPPA (bug #352744). + + 07 Dec 2010; Matt Turner <mattst88@gentoo.org> datefudge-1.14.ebuild: + Added ~mips, bug 326999. + + 13 Nov 2010; Raúl Porcel <armin76@gentoo.org> datefudge-1.14.ebuild: + Add ~ia64/~m68k/~s390/~sh/~sparc wrt #326999 + + 10 Oct 2010; Tobias Klausmann <klausman@gentoo.org> datefudge-1.14.ebuild: + Keyworded on alpha, bug #326999 + + 28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> datefudge-1.14.ebuild: + amd64/ppc64 stable + + 13 Sep 2010; Joseph Jezak <josejx@gentoo.org> datefudge-1.14.ebuild: + Marked ~ppc for bug #326999. + + 21 Jul 2010; Markus Meier <maekke@gentoo.org> datefudge-1.14.ebuild: + add ~arm, bug #326999 + + 19 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> datefudge-1.14.ebuild: + Keyword ~ppc64 wrt #326999. + + 14 Jul 2010; Jeroen Roovers <jer@gentoo.org> datefudge-1.14.ebuild: + Marked ~hppa (bug #326999). + +*datefudge-1.14 (05 Jul 2010) + + 05 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + +datefudge-1.14.ebuild: + Initial commit. diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest @@ -0,0 +1,7 @@ +AUX datefudge-1.17-bsd.patch 2751 SHA256 8aa05941e1ad690dc2a8b0266fbd9b39d8e24c6d77c2b56fcd31e732e25dda80 SHA512 390ff54428a4ffbdf5cc383aa6229f3ed7be7070d62567a0a04bf169efb6e7fe21c756d34d7865f51523a26204e6014edf936800523723d5f8370997f06dd858 WHIRLPOOL 8f48fb8f853c259424170a0dcd96cfcd6b14ad9f6107b90a08a217461a8ddb6d127ac861cdf244beea34694cd268407b22384889feb152286b9ae73978aac4df +AUX datefudge-alt-libc.patch 1071 SHA256 79e3bbc6675b0c5f47adad437203d6e84afe5c8eab3ce004ba6320b0d556348c SHA512 8ee0c6bd410eb485ae3f261a4eeded87ec38433eeee9945b8c6c9310e0adf4fb11f42a1e065192b37550c66f8014e5775a26722ea12a4cc412ba67230a33e6f4 WHIRLPOOL 80c2d08f368acc3907e32f2aa9ed0a341ed77fc59142491ec2b4bed5df256af635d779970e6a5a2742974966f106f1fa922d5f09ca7b371753dd8cf8026c1f5e +DIST datefudge_1.17.tar.gz 12606 SHA256 ff6c566ef6d587dce27396c15b178fafc3c3d8a0275dd6bbd5523b88badabec4 SHA512 6d335f2c1f42792756d3a81264be0bdf4cde5efab86bec5b62de9ccb2488deaff67e4a4f6c7984fa7a5336156df2d76e366bf486436052d2c5ee5ff88067335e WHIRLPOOL 1c107cea05910b900e249338969cf89448cd81e6de61ae1731df37160ffb399912c45d25d1f3f1bf95d0bb7f8d42139916bf13f5a37e4b68362d16f10bc9d718 +EBUILD datefudge-1.17-r1.ebuild 944 SHA256 2d6ac1db9d473cba33eb0e1d15db1e85fccdb94fea06483cb6a35f410fb3c116 SHA512 6c21b06e9c204bbb891a80ff97a99a065add1cb25660a6da2cbd3943a6565293e9c28622462686d5eebd693ab3fa3dd92cb041b04311132cd687577b3e29261a WHIRLPOOL eeabaf9f4046ae2881277e9751f6b9551c314d0ea990cc8f3b2d01df6c52227c6fb1e938ea6b17a96544749737a88cb19ae09243428b4a9e9c7d96ba5997f336 +MISC ChangeLog 2334 SHA256 285bc118938530d3f4083a70e3e9a921b7d077c5d5dc8fbdbf04ba6f5d8fb918 SHA512 05df138ef2947774eae1034cf3b3afd72944e1cccd8e5d560562c99e20fc373b5923c0d6b17900160bb4dcfe0f226ff77c492d99ead1ff78e0d6b2adf24da7b8 WHIRLPOOL be69a8f98ef47812b98dffbb3639b836e0574f7aa4f8b621fcf84d94d8f920823b5c8d9cdcb021776dce3b5670da54708b337f09724c262cf2a200eefe4fa34f +MISC ChangeLog-2015 3232 SHA256 427d4340f7b5ce35e4d0bad00e87441c27876c4f59e0ab390cdfa8bf39768841 SHA512 f148f7b8122fa13da23b99ac6e4294152e8229fd380fa448a64356dfc4413acdd4e89b0dc3f47564901b54e12cccbb6994acdc7ce1bc3927c7b22c4d04bb5bd8 WHIRLPOOL d4acc9b2a390a1c7e0a96bbc343f95e215ebe68bb2cc1d25655eb88653d77a88e33584b3b25114ffa7c72c990a1f4fce24051565b78e09eb53e019f0628ce450 +MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630 diff --git a/app-misc/datefudge/datefudge-1.17-r1.ebuild b/app-misc/datefudge/datefudge-1.17-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit multilib toolchain-funcs eutils + +DESCRIPTION="A program (and preload library) to fake system date" +HOMEPAGE="http://packages.qa.debian.org/d/datefudge.html" +SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" + +src_prepare() { + use userland_BSD && epatch "${FILESDIR}"/${P}-bsd.patch + epatch "${FILESDIR}/datefudge-alt-libc.patch" + sed -i \ + -e '/dpkg-parsechangelog/d' \ + -e "s:usr/lib:usr/$(get_libdir):" \ + Makefile || die + + if use prefix; then + sed -i -e '/-o root -g root/d' Makefile || die + fi + eapply_user +} + +src_compile() { + emake CC="$(tc-getCC)" VERSION="${PV}" +} + +src_install() { + emake DESTDIR="${ED}" VERSION="${PV}" install + dodoc debian/changelog README +} diff --git a/app-misc/datefudge/datefudge-1.17.ebuild b/app-misc/datefudge/datefudge-1.17.ebuild @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit multilib toolchain-funcs eutils - -DESCRIPTION="A program (and preload library) to fake system date" -HOMEPAGE="http://packages.qa.debian.org/d/datefudge.html" -SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -src_prepare() { - use userland_BSD && epatch "${FILESDIR}"/${P}-bsd.patch - sed -i \ - -e '/dpkg-parsechangelog/d' \ - -e "s:usr/lib:usr/$(get_libdir):" \ - Makefile || die - - if use prefix; then - sed -i -e '/-o root -g root/d' Makefile || die - fi -} - -src_compile() { - emake CC="$(tc-getCC)" VERSION="${PV}" -} - -src_install() { - emake DESTDIR="${ED}" VERSION="${PV}" install - dodoc debian/changelog README -} diff --git a/app-misc/datefudge/files/datefudge-1.17-bsd.patch b/app-misc/datefudge/files/datefudge-1.17-bsd.patch @@ -0,0 +1,58 @@ +diff --git a/Makefile b/Makefile +index b2f81bb..35da75e 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,17 +12,17 @@ compile all: datefudge datefudge.so + + install: datefudge datefudge.so datefudge.1 + install -d $(DESTDIR)/usr/lib/datefudge/ +- $(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so ++ $(INSTALL_PROGRAM) -o root -g wheel -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so + install -d $(DESTDIR)/usr/bin/ +- $(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)/usr/bin ++ $(INSTALL_PROGRAM) -o root -g wheel -m 755 datefudge $(DESTDIR)/usr/bin + install -d $(DESTDIR)/usr/share/man/man1 +- install -o root -g root -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1 ++ install -o root -g wheel -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1 + + datefudge: datefudge.sh + sed -e 's,@VERSION@,$(VERSION),g' < $< > $@ + + datefudge.so: datefudge.o +- $(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc ++ $(CC) $(LDFLAGS) -o $@ -shared $< -lc + + datefudge.o: datefudge.c + $(CC) $(CFLAGS) -c -o $@ $< +@@ -39,8 +39,8 @@ test: compile + export TZ=UTC ;\ + ret1=1; ret2=1 ;\ + for i in 1 2; do \ +- export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00' +%s` ;\ +- dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date --date=12:15 +%F.%T` ;\ ++ export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s` ;\ ++ dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date -v12H -v15M +%F.%T` ;\ + exp="1970-01-02.12:15:00" ;\ + [ "$$dt" != "$$exp" ] || { echo "OK"; ret1=0; break; } ;\ + echo "failed: expected: $$exp, actual: $$dt" ;\ +@@ -49,7 +49,7 @@ test: compile + echo -n "Running a simple perl localtime() test... " ;\ + pscr='@t=localtime(time);$$t[5]+=1900;$$t[4]++;printf "%04d-%02d-%02d\n",$$t[5],$$t[4],$$t[3];';\ + for i in 1 2; do \ +- export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00' +%s` ;\ ++ export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s` ;\ + dt=`LD_PRELOAD=$(CURDIR)/datefudge.so perl -e "$$pscr"` ;\ + exp="1970-01-02" ;\ + [ "$$dt" != "$$exp" ] || { echo "OK"; ret2=0; break; } ;\ +diff --git a/datefudge.c b/datefudge.c +index 8c86652..fc7e3d6 100644 +--- a/datefudge.c ++++ b/datefudge.c +@@ -14,7 +14,6 @@ + #include <stdlib.h> + #include <dlfcn.h> + #include <assert.h> +-#include <features.h> + #include <unistd.h> + #include <time.h> + #include <sys/time.h> diff --git a/app-misc/datefudge/files/datefudge-alt-libc.patch b/app-misc/datefudge/files/datefudge-alt-libc.patch @@ -0,0 +1,42 @@ +diff --git a/datefudge.c b/datefudge.c +index f816639..1501b10 100644 +--- a/datefudge.c ++++ b/datefudge.c +@@ -5,8 +5,6 @@ + * Copyright (C) 2008-2011, Robert Luberda <robert@debian.org> + * + */ +-#define _GNU_SOURCE +- + #include <sys/file.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -17,7 +15,7 @@ + #include <features.h> + #include <unistd.h> + #include <time.h> +-#include <sys/time.h> ++#include <sys/types.h> + + static int fudge = 0; + static int dostatic = 0; +@@ -62,8 +60,8 @@ time_t time(time_t *x) { + + #endif + +-int __gettimeofday(struct timeval *x, struct timezone *y) { +- static int (*libc_gettimeofday)(struct timeval *, struct timezone *) = NULL; ++int __gettimeofday(struct timeval *x, void *y) { ++ static int (*libc_gettimeofday)(struct timeval *, void *) = NULL; + int res; + + if(!libc_gettimeofday) +@@ -74,7 +72,7 @@ int __gettimeofday(struct timeval *x, struct timezone *y) { + return 0; + } + +-int gettimeofday(struct timeval *x, struct timezone *y) { ++int gettimeofday(struct timeval *x, void *y) { + return __gettimeofday(x,y); + } + diff --git a/app-misc/datefudge/metadata.xml b/app-misc/datefudge/metadata.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +</pkgmetadata>