head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.4 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q1:1.1.0.2 pkgsrc-2012Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2012.04.07.19.34.15; author joerg; state dead; branches; next 1.1; 1.1 date 2012.04.07.13.16.24; author joerg; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2012.04.07.20.59.51; author spz; state dead; branches; next ; desc @@ 1.2 log @Apply patches as intended. @ text @--- security/oath-toolkit/patches/patch-liboath_gl_fseeko.c +++ security/oath-toolkit/patches/patch-liboath_gl_fseeko.c @@@@ -0,0 +1,13 @@@@ +$NetBSD: patch-liboath_gl_fseeko.c.diff,v 1.1 2012/04/07 13:16:24 joerg Exp $ + +--- liboath/gl/fseeko.c.orig 2012-01-03 19:18:22.000000000 +0000 ++++ liboath/gl/fseeko.c +@@@@ -109,7 +109,7 @@@@ fseeko (FILE *fp, off_t offset, int when + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +-# if defined __CYGWIN__ ++# if defined(__CYGWIN__) || defined(__NetBSD__) + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; + # else @ 1.1 log @Fix build on NetBSD/current. @ text @d4 1 a4 1 +$NetBSD$ @ 1.1.2.1 log @Pullup ticket #3709 - requested by joerg security/oath-toolkit: build fix Revisions pulled up: - security/oath-toolkit/patches/patch-liboath_gl_fflush.c 1.1 - security/oath-toolkit/patches/patch-liboath_gl_fflush.c.diff deleted - security/oath-toolkit/patches/patch-liboath_gl_fseeko.c 1.1 - security/oath-toolkit/patches/patch-liboath_gl_fseeko.c.diff deleted ------------------------------------------------------------------- Module Name: pkgsrc Committed By: joerg Date: Sat Apr 7 19:34:16 UTC 2012 Added Files: pkgsrc/security/oath-toolkit/patches: patch-liboath_gl_fflush.c patch-liboath_gl_fseeko.c Removed Files: pkgsrc/security/oath-toolkit/patches: patch-liboath_gl_fflush.c.diff patch-liboath_gl_fseeko.c.diff Log Message: Apply patches as intended. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ pkgsrc/security/oath-toolkit/patches/patch-liboath_gl_fflush.c \ pkgsrc/security/oath-toolkit/patches/patch-liboath_gl_fseeko.c cvs rdiff -u -r1.1 -r0 \ pkgsrc/security/oath-toolkit/patches/patch-liboath_gl_fflush.c.diff \ pkgsrc/security/oath-toolkit/patches/patch-liboath_gl_fseeko.c.diff @ text @d4 1 a4 1 +$NetBSD: patch-liboath_gl_fseeko.c.diff,v 1.1 2012/04/07 13:16:24 joerg Exp $ @