From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 18 20:30:12 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5AE0916A401 for ; Tue, 18 Apr 2006 20:30:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B666143D53 for ; Tue, 18 Apr 2006 20:30:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3IKUBDB080548 for ; Tue, 18 Apr 2006 20:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3IKUBmq080547; Tue, 18 Apr 2006 20:30:11 GMT (envelope-from gnats) Resent-Date: Tue, 18 Apr 2006 20:30:11 GMT Resent-Message-Id: <200604182030.k3IKUBmq080547@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Diane Bruce Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB94316A404 for ; Tue, 18 Apr 2006 20:29:40 +0000 (UTC) (envelope-from db@db.net) Received: from heceta.db.net (heceta.db.net [142.46.199.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id E105C43D53 for ; Tue, 18 Apr 2006 20:29:39 +0000 (GMT) (envelope-from db@db.net) Received: from db by heceta.db.net with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1FVwpP-000DZc-1k; Tue, 18 Apr 2006 16:29:39 -0400 Message-Id: Date: Tue, 18 Apr 2006 16:29:39 -0400 From: Diane Bruce To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96020: [PATCH] comms/trustedqsl: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 20:30:12 -0000 >Number: 96020 >Category: ports >Synopsis: [PATCH] comms/trustedqsl: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 18 20:30:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Diane Bruce >Release: FreeBSD 4.11-RELEASE-p9 i386 >Organization: >Environment: System: FreeBSD heceta.db.net 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #4: Tue May 17 16:07:52 EDT 2005 >Description: [DESCRIBE CHANGES] Added file(s): - files/patch-tqsllib-2.0_Makefile.in - files/patch-tqsllib-2.0_openssl_cert.cpp Removed file(s): - files/Makefile.tqsllib - files/sysconfig.h.tqsllib Port maintainer (db@db.net) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- trustedqsl-1.11_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/Makefile /usr/home/db/trustedqsl/Makefile --- /usr/ports/comms/trustedqsl/Makefile Wed Feb 15 22:28:54 2006 +++ /usr/home/db/trustedqsl/Makefile Tue Apr 18 16:27:28 2006 @@ -7,11 +7,11 @@ PORTNAME= trustedqsl PORTVERSION= 1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= trustedqsl -DISTFILES= tqsllib-1.4.tar.gz TrustedQSL-1.11.tar.gz +DISTFILES= tqsllib-2.0.tar.gz TrustedQSL-1.11.tar.gz MAINTAINER= db@db.net COMMENT= Amateur Radio Station electronic trusted logbook @@ -21,7 +21,6 @@ USE_PERL5= yes USE_GETOPT_LONG= yes -USE_REINPLACE= yes MAKE_ENV= INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -33,11 +32,12 @@ .endif post-patch: - ${CP} ${FILESDIR}/Makefile ${WRKSRC} - ${CP} ${FILESDIR}/Makefile.tqsllib ${WRKSRC}/tqsllib/Makefile - ${CP} ${FILESDIR}/Makefile.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/Makefile - ${CP} ${FILESDIR}/sysconfig.h.tqsllib ${WRKSRC}/tqsllib/sysconfig.h - ${CP} ${FILESDIR}/sysconfig.h.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/sysconfig.h + @${CP} ${FILESDIR}/Makefile ${WRKSRC} + @${REINPLACE_CMD} -e 's|%%INSTALL%%|${INSTALL_PROGRAM}|' \ + -e 's|%%PREFIX%%|${PREFIX}|' \ + ${WRKSRC}/Makefile + @${CP} ${FILESDIR}/Makefile.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/Makefile + @${CP} ${FILESDIR}/sysconfig.h.TrustedQSL-1.11 ${WRKSRC}/TrustedQSL-1.11/sysconfig.h do-extract: @${RM} -rf ${WRKDIR} @@ -51,11 +51,22 @@ done post-install: + ${MKDIR} ${PREFIX}/etc/tqsl + ${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/config.xml ${PREFIX}/etc/tqsl/config.xml .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/tqslcert @${MKDIR} ${PREFIX}/share/doc/tqslapp - @${CP} ${WRKSRC}/TrustedQSL-1.11/help/tqslcert/* ${PREFIX}/share/doc/tqslcert/ - @${CP} ${WRKSRC}/TrustedQSL-1.11/help/tqslapp/* ${PREFIX}/share/doc/tqslapp/ + @${INSTALL_DATA} ${WRKSRC}/TrustedQSL-1.11/help/tqslcert/* ${PREFIX}/share/doc/tqslcert/ + @${INSTALL_DATA} ${WRKSRC}/TrustedQSL-1.11/help/tqslapp/* ${PREFIX}/share/doc/tqslapp/ + @${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/LICENSE ${PREFIX}/share/doc/tqsllib + @${INSTALL_DATA} ${WRKSRC}/tqsllib-2.0/ChangeLog ${PREFIX}/share/doc/tqsllib .endif + @${ECHO} + @${ECHO} trustedqsl is now installed. + @${ECHO} You will have to create a directory .tqsl in your + @${ECHO} home directory and setup a copy of + @${ECHO} ${PREFIX}/etc/tqsl/config.xml here + @${ECHO} before this program will run correctly. + @${ECHO} .include diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/distinfo /usr/home/db/trustedqsl/distinfo --- /usr/ports/comms/trustedqsl/distinfo Tue Nov 29 00:31:15 2005 +++ /usr/home/db/trustedqsl/distinfo Wed Mar 29 08:15:37 2006 @@ -1,6 +1,6 @@ -MD5 (tqsllib-1.4.tar.gz) = 008705afbf39f52e0984e195d32e8378 -SHA256 (tqsllib-1.4.tar.gz) = 3b21fa2734c95c872847c9ce81590cf34b97d48274f307cdf784eed57f76643c -SIZE (tqsllib-1.4.tar.gz) = 160585 +MD5 (tqsllib-2.0.tar.gz) = eab6bcd6c93561881f68ef184456a193 +SHA256 (tqsllib-2.0.tar.gz) = 083c4405455c5b5a711e82275fe2b7106266bfc1edbd1a78ef542244e25909dc +SIZE (tqsllib-2.0.tar.gz) = 433450 MD5 (TrustedQSL-1.11.tar.gz) = 2b39274763ec27823489f2eca975fdab SHA256 (TrustedQSL-1.11.tar.gz) = 1b208e6f84602c161d936dae161e40b555ebc53883b4eda33d6e8f5fa84d68d9 SIZE (TrustedQSL-1.11.tar.gz) = 346049 diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/Makefile /usr/home/db/trustedqsl/files/Makefile --- /usr/ports/comms/trustedqsl/files/Makefile Tue Nov 29 00:31:15 2005 +++ /usr/home/db/trustedqsl/files/Makefile Mon Apr 3 13:16:00 2006 @@ -1,9 +1,11 @@ # $FreeBSD: ports/comms/trustedqsl/files/Makefile,v 1.2 2005/11/22 21:40:50 pav Exp $ all: - (cd tqsllib;make) + (cd tqsllib-2.0;./configure --with-wxwindows=${X11BASE}/bin/wxgtk2-2.6-config;make;make converter;make gen_crq;make load_cert;make station_loc) (cd TrustedQSL-1.11;make) install: - (cd tqsllib;make install) + (cd tqsllib-2.0;make install) + (cd tqsllib-2.0/.libs; \ + %%INSTALL%% converter gen_crq load_cert station_loc %%PREFIX%%/bin) (cd TrustedQSL-1.11;make install) diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/Makefile.TrustedQSL-1.11 /usr/home/db/trustedqsl/files/Makefile.TrustedQSL-1.11 --- /usr/ports/comms/trustedqsl/files/Makefile.TrustedQSL-1.11 Tue Nov 22 16:40:50 2005 +++ /usr/home/db/trustedqsl/files/Makefile.TrustedQSL-1.11 Tue Apr 18 13:06:50 2006 @@ -1,8 +1,7 @@ -TQSLLIB=../tqsllib -TQSLINC=../tqsllib -TQSL_VERSION_MAJOR = 1 -TQSL_VERSION_MINOR = 11 -OPENSSL=/usr/local +TQSLLIB=../tqsllib-2.0/.libs +TQSLINC=../tqsllib-2.0 +TQSL_VERSION_MAJOR = 2 +TQSL_VERSION_MINOR = 0 LIBS=-lz -lexpat -lcrypto INCDIR = -I$(TQSLINC) BUILD = unofficial @@ -11,7 +10,7 @@ DEFS = -DHAVE_CONFIG_H CXXFLAGS += $(DEFS) $(INCDIR) -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1 $(WXFLAGS) -LDLIBS = -L$(TQSLLIB) -L$(OPENSSL)/lib -ltqsllib $(LIBS) $(WXLIBS) +LDLIBS = -L$(TQSLLIB) -ltqsllib $(LIBS) $(WXLIBS) TQSLLIBFILE=$(TQSLLIB)/libtqsllib.a CCDEPMODE = depmode=gcc3 BINDIR=${PREFIX}/bin @@ -62,4 +61,3 @@ install: ${INSTALL} -d $(BINDIR) $(ETCDIR)/tqsl ${INSTALL} -C $(TARGETS) $(BINDIR) - ${INSTALL} -C ../tqsllib/config.xml $(ETCDIR)/tqsl diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/Makefile.tqsllib /usr/home/db/trustedqsl/files/Makefile.tqsllib --- /usr/ports/comms/trustedqsl/files/Makefile.tqsllib Tue Nov 29 00:31:15 2005 +++ /usr/home/db/trustedqsl/files/Makefile.tqsllib Wed Dec 31 19:00:00 1969 @@ -1,49 +0,0 @@ -CXX = g++ -CC ?= gcc -LIBS=-lcrypto -lexpat -CXXFLAGS += -I. -I${LOCALBASE}/include -DHAVE_CONFIG_H -LDFLAGS = -L. $(LIBS) -L${LOCALBASE}/lib -lstdc++ -TARGETS = gen_crq load_cert station_loc dumptqsldata converter -ZLIB=z -MYLIB=tqsllib - -OBJS= tqsllib.o openssl_cert.o adif.o xml.o\ - location.o tqslconvert.o cabrillo.o - -all: $(TARGETS) - -gen_crq: gen_crq.o lib$(MYLIB).a - ${CXX} -o gen_crq gen_crq.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB) - -load_cert: load_cert.o lib$(MYLIB).a - ${CXX} -o load_cert load_cert.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB) - -converter: converter.o lib$(MYLIB).a - ${CXX} -o converter converter.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB) - -station_loc: station_loc.o lib$(MYLIB).a - ${CXX} -o station_loc station_loc.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB) - -dumptqsldata: dumptqsldata.o lib$(MYLIB).a - ${CXX} -o dumptqsldata dumptqsldata.o -l$(MYLIB) $(LDFLAGS) -l$(ZLIB) - -include tqsllib.depends - -libtqsllib.a: $(OBJS) - ${AR} qc libtqsllib.a ${OBJS} - -install: - ${INSTALL} gen_crq ${PREFIX}/bin - ${INSTALL} load_cert ${PREFIX}/bin - ${INSTALL} converter ${PREFIX}/bin - ${INSTALL} station_loc ${PREFIX}/bin - ${INSTALL} dumptqsldata ${PREFIX}/bin - -clean: - rm -f converter dumptqsldata gen_crq load_cert station_loc - rm -f *.o *.lo *.a *.la *~ xxx.* *.a - rm -rf .libs - -%.o: %.cpp - ${CXX} ${CXXFLAGS} -c -o $@ $*.cpp - diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/patch-tqsllib-2.0_Makefile.in /usr/home/db/trustedqsl/files/patch-tqsllib-2.0_Makefile.in --- /usr/ports/comms/trustedqsl/files/patch-tqsllib-2.0_Makefile.in Wed Dec 31 19:00:00 1969 +++ /usr/home/db/trustedqsl/files/patch-tqsllib-2.0_Makefile.in Tue Apr 18 15:53:53 2006 @@ -0,0 +1,12 @@ +--- tqsllib-2.0/Makefile.in.orig Fri Mar 11 07:58:31 2005 ++++ tqsllib-2.0/Makefile.in Tue Apr 18 15:53:02 2006 +@@ -767,8 +767,7 @@ + + info-am: + +-install-data-am: install-dataDATA install-docDATA \ +- install-includeHEADERS ++install-data-am: install-includeHEADERS + + install-exec-am: install-binPROGRAMS install-exec-local \ + install-libLIBRARIES install-libLTLIBRARIES diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/patch-tqsllib-2.0_openssl_cert.cpp /usr/home/db/trustedqsl/files/patch-tqsllib-2.0_openssl_cert.cpp --- /usr/ports/comms/trustedqsl/files/patch-tqsllib-2.0_openssl_cert.cpp Wed Dec 31 19:00:00 1969 +++ /usr/home/db/trustedqsl/files/patch-tqsllib-2.0_openssl_cert.cpp Wed Mar 29 11:29:29 2006 @@ -0,0 +1,11 @@ +--- tqsllib-2.0/openssl_cert.cpp.orig Fri Mar 11 07:47:11 2005 ++++ tqsllib-2.0/openssl_cert.cpp Wed Mar 29 11:27:41 2006 +@@ -1290,6 +1290,8 @@ + attrib->set = 1; + #elif (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00907000 + attrib->single = 0; ++#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00908000 ++ attrib->single = 0; + #else + #error "Unexpected OpenSSL version; check X509_ATTRIBUTE struct compatibility" + #endif diff -ruN --exclude=CVS /usr/ports/comms/trustedqsl/files/sysconfig.h.tqsllib /usr/home/db/trustedqsl/files/sysconfig.h.tqsllib --- /usr/ports/comms/trustedqsl/files/sysconfig.h.tqsllib Tue Nov 22 16:40:50 2005 +++ /usr/home/db/trustedqsl/files/sysconfig.h.tqsllib Wed Dec 31 19:00:00 1969 @@ -1,45 +0,0 @@ -/* tqsllib/sysconfig.h. Generated automatically by configure. */ -/* lotwdb/sysconfig.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define to `int' if doesn't define. */ -/* #undef mode_t */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if your declares struct tm. */ -/* #undef TM_IN_SYS_TIME */ - -/* Defined if this is LOTW server code */ -#undef LOTW_SERVER - -/* Define if you have the mkdir function. */ -#define HAVE_MKDIR 1 - -/* Define if you have the strerror function. */ -#define HAVE_STRERROR 1 - -/* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 1 - -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define if you have the header file. */ -#define HAVE_GETOPT_H - -/* Define if you have the crypto library (-lcrypto). */ -#define HAVE_LIBCRYPTO 1 - -/* Define if you have the dl library (-ldl). */ -#define HAVE_LIBDL 1 - -/* Define if you have the pcrl library (-lpcrl). */ -#undef HAVE_LIBPCRL - -/* Define if you have the sqlca library (-lsqlca). */ -#undef HAVE_LIBSQLCA - --- trustedqsl-1.11_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: