From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 9 11:50:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2945F1065671 for ; Sun, 9 Mar 2008 11:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0051C8FC1A for ; Sun, 9 Mar 2008 11:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m29Bo0U4069379 for ; Sun, 9 Mar 2008 11:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m29Bo01P069378; Sun, 9 Mar 2008 11:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 9 Mar 2008 11:50:00 GMT Resent-Message-Id: <200803091150.m29Bo01P069378@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, Yarodin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 523FD106566B for ; Sun, 9 Mar 2008 11:44:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 3B2578FC16 for ; Sun, 9 Mar 2008 11:44:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m29BffnK017024 for ; Sun, 9 Mar 2008 11:41:41 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m29Bff34017022; Sun, 9 Mar 2008 11:41:41 GMT (envelope-from nobody) Message-Id: <200803091141.m29Bff34017022@www.freebsd.org> Date: Sun, 9 Mar 2008 11:41:41 GMT From: Yarodin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/121517: [UPDATE] sysutils/deltup to 0.4.4 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: Sun, 09 Mar 2008 11:50:01 -0000 >Number: 121517 >Category: ports >Synopsis: [UPDATE] sysutils/deltup to 0.4.4 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Mar 09 11:50:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Yarodin >Release: 6.3-RELEASE >Organization: >Environment: >Description: Update sysutils/deltup to 0.4.4 >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2005-06-05 21:32:48.000000000 +0600 +++ Makefile 2008-03-09 16:08:59.000000000 +0500 @@ -6,10 +6,10 @@ # PORTNAME= deltup -PORTVERSION= 0.4.2 -PORTREVISION= 1 +PORTVERSION= 0.4.4 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= http://www.deltup.org/e107_files/downloads/ \ + ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= novel@FreeBSD.org @@ -18,6 +18,8 @@ RUN_DEPENDS= bdelta:${PORTSDIR}/misc/bdelta USE_OPENSSL= yes +USE_GMAKE= yes + ALL_TARGET= deltup PLIST_FILES= bin/deltup \ bin/bzip2_old --- distinfo.orig 2006-01-24 06:06:02.000000000 +0500 +++ distinfo 2008-03-09 16:07:51.000000000 +0500 @@ -1,3 +1,3 @@ -MD5 (deltup-0.4.2.tar.gz) = ac097b01b67719e51df8c6d677d28cd7 -SHA256 (deltup-0.4.2.tar.gz) = a4b20833130aa186b28fa6d936499513685f37888972e928778977187dbaa6a9 -SIZE (deltup-0.4.2.tar.gz) = 15714 +MD5 (deltup-0.4.4.tar.gz) = 3b8da493eec796bf4aa09f59f318a9cc +SHA256 (deltup-0.4.4.tar.gz) = fba7f1a970a04b2b786402e55c017c667b065f1974154f2ba6a65c855357b744 +SIZE (deltup-0.4.4.tar.gz) = 14905 --- files/patch-Makefile.orig 2005-05-20 09:26:52.000000000 +0600 +++ files/patch-Makefile 2008-03-09 16:17:16.000000000 +0500 @@ -1,11 +1,22 @@ ---- Makefile.orig Sat Jul 19 22:25:26 2003 -+++ Makefile Fri May 20 03:23:04 2005 -@@ -5,7 +5,7 @@ +--- Makefile.orig 2008-03-09 16:13:57.000000000 +0500 ++++ Makefile 2008-03-09 16:16:06.000000000 +0500 +@@ -1,16 +1,16 @@ + DESTDIR= +-PREFIX=/usr ++PREFIX=/usr/local + BINDIR=$(PREFIX)/bin + + CC = g++ + + objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o +-libs=-lstdc++ -lz -lbz2 -lssl ++libs=-lstdc++ -lz -lbz2 -lssl -lcrypt + #edelta: edelta.cpp deltup # gcc edelta.cpp ${CXXFLAGS} -o edelta - deltup: deltup.cpp file.h linklist.h -- gcc deltup.cpp ${CXXFLAGS} -o deltup -lstdc++ -lz -lbz2 -lssl -+ ${CXX} deltup.cpp ${CXXFLAGS} -o deltup -lstdc++ -lz -lbz2 -lssl -lcrypto - install: deltup - mkdir -p $(DESTDIR)$(BINDIR) - install -m 755 mkdtu $(DESTDIR)$(BINDIR) + %.o : %.cpp +- ${CC} -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE ++ ${CC} -c $< -o $@ ${CXXFLAGS} -g #-Wall -pedantic #-DFIXED_FRAMERATE + + all: deltup + --- files/patch-bzip2.cpp.orig 1970-01-01 05:00:00.000000000 +0500 +++ files/patch-bzip2.cpp 2008-03-09 16:12:28.000000000 +0500 @@ -0,0 +1,38 @@ +--- bzip2.cpp.orig 2007-03-25 04:59:24.000000000 +0600 ++++ bzip2.cpp 2008-03-09 11:19:55.000000000 +0500 +@@ -19,6 +19,7 @@ + #include "system.h" + #include "tmpstore.h" + #include "bzip2.h" ++#include + + char *bzip2_compressor_name[MAX_BZIP2_COMPRESSORS] = {"0.9.0c", "1.0.2", "1.0.3", "1.0.4"}; + char *bzip2_name[MAX_BZIP2_COMPRESSORS] = {NULL, NULL, NULL, NULL}; +@@ -31,14 +32,12 @@ + system(command.c_str()); + + FILE * fp; +- char * line = NULL; ++ char line[2*CHAR_MAX]; + string fname; +- size_t len = 0; +- ssize_t read; + fp = fopen(tempfile.c_str(), "r"); + if (fp == NULL) + exit(EXIT_FAILURE); +- while ((read = getline(&line, &len, fp)) != -1) { ++ while (fgets(line, 2*CHAR_MAX, fp)!=NULL) { + // printf("Retrieved line of length %zu :\n", read); + // printf("%s", line); + char *v = strstr(line, "Version"); +@@ -56,8 +55,8 @@ + } + fname = line; + } +- if (line) +- free(line); ++// if (line) ++// free(&line); + if (verbose) { + printf("found bzip2 compressors/decompressors:\n"); + for (int i = 0; i < MAX_BZIP2_COMPRESSORS; ++i) { --- files/patch-deltup.cpp.orig 2005-06-05 21:32:48.000000000 +0600 +++ files/patch-deltup.cpp 2008-03-09 16:13:13.000000000 +0500 @@ -1,19 +1,19 @@ ---- deltup.cpp.orig Fri May 27 18:53:49 2005 -+++ deltup.cpp Fri May 27 18:55:24 2005 -@@ -748,14 +748,14 @@ - void applyPatchfile(char *fname) { +--- deltup.cpp.orig 2007-07-13 09:22:20.000000000 +0600 ++++ deltup.cpp 2008-03-08 23:18:08.000000000 +0500 +@@ -520,14 +520,14 @@ IStream *f = new IFStream(fname); Injectable_IStream f2(*f); -- if (((IFStream*)f)->bad()) {fprintf(stderr, "file is missing: %s\n", fname); return;} -+ if (((IFStream*)f)->bad()) {fprintf(stderr, "file is missing: %s\n", fname); exit(1);} - int type = determine_filetype(f2); + if (((IFStream*)f)->bad()) { +- fprintf(stderr, "file is missing: %s\n", fname.c_str()); return;} ++ fprintf(stderr, "file is missing: %s\n", fname.c_str()); exit(1);} + unsigned type = determine_filetype(f2); delete f; switch (type) { case GZIP: f = new GZ_IFStream(fname); break; case BZIP2: f = new BZ_IFStream(fname); break; case DTU: f = new IFStream(fname); break; -- case UNKNOWN_FMT: fprintf(stderr, "cannot read file %s\n", fname); return; -+ case UNKNOWN_FMT: fprintf(stderr, "cannot read file %s\n", fname); exit(1); +- case UNKNOWN_FMT: fprintf(stderr, "cannot read file %s\n", fname.c_str()); return; ++ case UNKNOWN_FMT: fprintf(stderr, "cannot read file %s\n", fname.c_str()); exit(1); case TARBALL : f = new IFStream(fname); unsigned zero_count; --- files/patch-system.cpp.orig 1970-01-01 05:00:00.000000000 +0500 +++ files/patch-system.cpp 2008-03-09 16:13:41.000000000 +0500 @@ -0,0 +1,11 @@ +--- system.cpp.orig 2007-03-25 04:45:52.000000000 +0600 ++++ system.cpp 2008-03-08 22:51:00.000000000 +0500 +@@ -19,7 +19,7 @@ + using namespace std; + #include "file.h" + #include "bpatch.h" +- ++#include + #include "filetypes.h" + + bool verbose = false; >Release-Note: >Audit-Trail: >Unformatted: