From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 4 11:10:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6492E4F1 for ; Thu, 4 Apr 2013 11:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 4B1ED767 for ; Thu, 4 Apr 2013 11:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r34BA1WS024198 for ; Thu, 4 Apr 2013 11:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r34BA1eH024197; Thu, 4 Apr 2013 11:10:01 GMT (envelope-from gnats) Resent-Date: Thu, 4 Apr 2013 11:10:01 GMT Resent-Message-Id: <201304041110.r34BA1eH024197@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, Denis Generalov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D586B475 for ; Thu, 4 Apr 2013 11:05:11 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id B6C42735 for ; Thu, 4 Apr 2013 11:05:11 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r34B5AEk065427 for ; Thu, 4 Apr 2013 11:05:10 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r34B5Al8065426; Thu, 4 Apr 2013 11:05:10 GMT (envelope-from nobody) Message-Id: <201304041105.r34B5Al8065426@red.freebsd.org> Date: Thu, 4 Apr 2013 11:05:10 GMT From: Denis Generalov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/177626: Update port net/nbd-server to 3.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2013 11:10:01 -0000 >Number: 177626 >Category: ports >Synopsis: Update port net/nbd-server to 3.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Apr 04 11:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Denis Generalov >Release: FreeBSD 9.1-STABLE amd64 >Organization: Rambler >Environment: FreeBSD tyl.rambler.ramblermedia.com 9.1-STABLE FreeBSD 9.1-STABLE #0 r244924: Tue Jan 1 21:05:19 MSK 2013 gd@tyl.rambler.ramblermedia.com:/tmp/gd/usr/src/sys/GENERIC amd64 >Description: Update port net/nbd-server to 3.2 >How-To-Repeat: >Fix: Patch attached with submission follows: ===> Generating patch ===> Viewing diff with more diff -ruN /usr/ports//net/nbd-server/Makefile ./Makefile --- /usr/ports//net/nbd-server/Makefile 2013-03-08 16:05:39.000000000 +0400 +++ ./Makefile 2013-04-04 14:52:32.000000000 +0400 @@ -2,8 +2,7 @@ # $FreeBSD: head/net/nbd-server/Makefile 313633 2013-03-08 10:51:34Z kwm $ PORTNAME= nbd-server -PORTVERSION= 2.8.5 -PORTREVISION= 1 +PORTVERSION= 3.2 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF/nbd/nbd/${PORTVERSION} @@ -18,10 +17,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --enable-lfs --enable-syslog -PLIST_FILES= bin/nbd-server -MAN1= nbd-server.1 - -post-extract: - @${CP} ${FILESDIR}/nbd.h ${WRKSRC} +PLIST_FILES= bin/nbd-server \ + bin/nbd-trdump +MAN1= nbd-server.1 \ + nbd-trdump.1 +MAN5= nbd-server.5 +MAN8= nbd-client.8 .include diff -ruN /usr/ports//net/nbd-server/distinfo ./distinfo --- /usr/ports//net/nbd-server/distinfo 2012-09-12 19:10:34.000000000 +0400 +++ ./distinfo 2013-04-04 14:32:33.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (nbd-2.8.5.tar.bz2) = dc77166f086712fa0d1ff63997d487d99eaac238819b1aebff9a8fddfcc0b835 -SIZE (nbd-2.8.5.tar.bz2) = 151053 +SHA256 (nbd-3.2.tar.bz2) = e297c1883133f04a55d8e9527a2e4344e577a54046cf81694ffabe13f73793db +SIZE (nbd-3.2.tar.bz2) = 508734 diff -ruN /usr/ports//net/nbd-server/files/nbd.h ./files/nbd.h --- /usr/ports//net/nbd-server/files/nbd.h 2012-09-12 19:10:34.000000000 +0400 +++ ./files/nbd.h 1970-01-01 03:00:00.000000000 +0300 @@ -1,91 +0,0 @@ -/* - * 1999 Copyright (C) Pavel Machek, pavel@ucw.cz. This code is GPL. - * 1999/11/04 Copyright (C) 1999 VMware, Inc. (Regis "HPReg" Duchesne) - * Made nbd_end_request() use the io_request_lock - * 2001 Copyright (C) Steven Whitehouse - * New nbd_end_request() for compatibility with new linux block - * layer code. - * 2003/06/24 Louis D. Langholtz - * Removed unneeded blksize_bits field from nbd_device struct. - * Cleanup PARANOIA usage & code. - * 2004/02/19 Paul Clements - * Removed PARANOIA, plus various cleanup and comments - */ - -#ifndef LINUX_NBD_H -#define LINUX_NBD_H - -#define NBD_SET_SOCK _IO( 0xab, 0 ) -#define NBD_SET_BLKSIZE _IO( 0xab, 1 ) -#define NBD_SET_SIZE _IO( 0xab, 2 ) -#define NBD_DO_IT _IO( 0xab, 3 ) -#define NBD_CLEAR_SOCK _IO( 0xab, 4 ) -#define NBD_CLEAR_QUE _IO( 0xab, 5 ) -#define NBD_PRINT_DEBUG _IO( 0xab, 6 ) -#define NBD_SET_SIZE_BLOCKS _IO( 0xab, 7 ) -#define NBD_DISCONNECT _IO( 0xab, 8 ) - -enum { - NBD_CMD_READ = 0, - NBD_CMD_WRITE = 1, - NBD_CMD_DISC = 2 -}; - -#define nbd_cmd(req) ((req)->cmd[0]) -#define MAX_NBD 128 - -/* userspace doesn't need the nbd_device structure */ -#ifdef __KERNEL__ - -/* values for flags field */ -#define NBD_READ_ONLY 0x0001 -#define NBD_WRITE_NOCHK 0x0002 - -struct nbd_device { - int flags; - int harderror; /* Code of hard error */ - struct socket * sock; - struct file * file; /* If == NULL, device is not ready, yet */ - int magic; - spinlock_t queue_lock; - struct list_head queue_head;/* Requests are added here... */ - struct semaphore tx_lock; - struct gendisk *disk; - int blksize; - u64 bytesize; -}; - -#endif - -/* These are sent over the network in the request/reply magic fields */ - -#define NBD_REQUEST_MAGIC 0x25609513 -#define NBD_REPLY_MAGIC 0x67446698 -/* Do *not* use magics: 0x12560953 0x96744668. */ - -/* - * This is the packet used for communication between client and - * server. All data are in network byte order. - */ -struct nbd_request { - u32 magic; - u32 type; /* == READ || == WRITE */ - char handle[8]; - u64 from; - u32 len; -} -#ifdef __GNUC__ - __attribute__ ((packed)) -#endif -; - -/* - * This is the reply packet that nbd-server sends back to the client after - * it has completed an I/O request (or an error occurs). - */ -struct nbd_reply { - u32 magic; - u32 error; /* 0 = ok, else error */ - char handle[8]; /* handle you got from request */ -}; -#endif diff -ruN /usr/ports//net/nbd-server/files/patch-nbd-server.c ./files/patch-nbd-server.c --- /usr/ports//net/nbd-server/files/patch-nbd-server.c 2012-09-12 19:10:34.000000000 +0400 +++ ./files/patch-nbd-server.c 1970-01-01 03:00:00.000000000 +0300 @@ -1,18 +0,0 @@ -diff -urN nbd-2.8.3.orig/nbd-server.c nbd-2.8.3/nbd-server.c ---- nbd-2.8.3.orig/nbd-server.c Thu Dec 22 21:37:20 2005 -+++ nbd-server.c Sun Jan 8 16:45:30 2006 -@@ -363,12 +363,12 @@ - * is severely wrong) - **/ - void sigchld_handler(int s) { -- int* status=NULL; -+ int status; - int* i; - pid_t pid; - int done=0; - -- while(!done && (pid=wait(status)) > 0) { -+ while(!done && (pid=wait(&status)) > 0) { - if(WIFEXITED(status)) { - msg3(LOG_INFO, "Child exited with %d", WEXITSTATUS(status)); - msg3(LOG_INFO, "pid is %d", pid); ===> Done >Release-Note: >Audit-Trail: >Unformatted: