From nobody@FreeBSD.org  Wed Jun  2 06:16:40 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A8AB1065672
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  2 Jun 2010 06:16:40 +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 497788FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  2 Jun 2010 06:16:40 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o526GdMp016903
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 2 Jun 2010 06:16:39 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o526Gdtq016898;
	Wed, 2 Jun 2010 06:16:39 GMT
	(envelope-from nobody)
Message-Id: <201006020616.o526Gdtq016898@www.freebsd.org>
Date: Wed, 2 Jun 2010 06:16:39 GMT
From: Dmitry Yashin <yashin.dm@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: net-p2p/uhub from 0.3.1 to 0.3.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         147308
>Category:       ports
>Synopsis:       Update port: net-p2p/uhub from 0.3.1 to 0.3.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 02 06:20:02 UTC 2010
>Closed-Date:    Wed Jun 02 15:11:47 UTC 2010
>Last-Modified:  Wed Jun  2 15:20:01 UTC 2010
>Originator:     Dmitry Yashin
>Release:        7.0-RELEASE-p11
>Organization:
>Environment:
FreeBSD python 7.0-RELEASE-p11 FreeBSD 7.0-RELEASE-p11 #0: Sun Mar 22 07:08:52 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
0.3.2:
- Fixed bugs in the kqueue network backend (OSX/BSD)
- Rewrote the configuration backend code.
- Added support for escaping characters in the configuration files.
- Updated the !broadcast command to send private messages instead of main chat messages.
- Adding support for redirecting clients to other hubs when they fail to log in.
- Fix some out of memory related crashes.
- Fixed minor memory leaks.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/net-p2p/uhub.orig/Makefile /usr/ports/net-p2p/uhub/Makefile
--- /usr/ports/net-p2p/uhub.orig/Makefile	2010-06-02 09:15:17.000000000 +0400
+++ /usr/ports/net-p2p/uhub/Makefile	2010-06-02 09:32:17.000000000 +0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uhub
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://www.extatic.org/downloads/uhub/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -42,5 +42,8 @@
 	@if [ -f ${PREFIX}/etc/uhub/motd.txt ]; then \
 		${TOUCH} ${PREFIX}/etc/uhub/motd.txt.sample ; \
 	fi
+	@if [ -f ${PREFIX}/etc/uhub/rules.txt ]; then \
+		${TOUCH} ${PREFIX}/etc/uhub/rules.txt.sample ; \
+	fi
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net-p2p/uhub.orig/distinfo /usr/ports/net-p2p/uhub/distinfo
--- /usr/ports/net-p2p/uhub.orig/distinfo	2010-06-02 09:15:17.000000000 +0400
+++ /usr/ports/net-p2p/uhub/distinfo	2010-06-02 09:32:59.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (uhub-0.3.1-src.tar.gz) = 7e2810dceede442ba5c108bec50de4e5
-SHA256 (uhub-0.3.1-src.tar.gz) = 637b605c029738434438b5fe00a09a10a7bf3debddbe53b9dd12825644e68da0
-SIZE (uhub-0.3.1-src.tar.gz) = 147350
+MD5 (uhub-0.3.2-src.tar.gz) = 1ac1e561779597577f96d21736750088
+SHA256 (uhub-0.3.2-src.tar.gz) = 8503f9775e2469e271a461452cedf1ef6c0d32b38e0bec6b77170b216a5a374e
+SIZE (uhub-0.3.2-src.tar.gz) = 156108
diff -ruN --exclude=CVS /usr/ports/net-p2p/uhub.orig/files/patch-GNUmakefile /usr/ports/net-p2p/uhub/files/patch-GNUmakefile
--- /usr/ports/net-p2p/uhub.orig/files/patch-GNUmakefile	2010-06-02 09:15:17.000000000 +0400
+++ /usr/ports/net-p2p/uhub/files/patch-GNUmakefile	2010-06-02 09:57:15.000000000 +0400
@@ -1,5 +1,5 @@
---- GNUmakefile	2010-04-05 18:53:17.000000000 +0400
-+++ GNUmakefile.orig	2010-04-06 11:19:35.000000000 +0400
+--- GNUmakefile.orig	2010-06-02 09:48:21.000000000 +0400
++++ GNUmakefile	2010-06-02 09:55:21.000000000 +0400
 @@ -5,7 +5,7 @@
  
  -include Makefile.private
@@ -24,12 +24,13 @@
  BIN_EXT       ?=
  endif
  
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,8 @@
  	@if [ ! -d $(UHUB_CONF_DIR) ]; then echo Creating $(UHUB_CONF_DIR); mkdir -p $(UHUB_CONF_DIR); fi
  	@if [ ! -f $(UHUB_CONF_DIR)/uhub.conf ]; then cp doc/uhub.conf $(UHUB_CONF_DIR); fi
  	@if [ ! -f $(UHUB_CONF_DIR)/users.conf ]; then cp doc/users.conf  $(UHUB_CONF_DIR); fi
 -	@touch $(UHUB_CONF_DIR)/motd.txt
 +	@if [ ! -f $(UHUB_CONF_DIR)/motd.txt ]; then touch $(UHUB_CONF_DIR)/motd.txt; fi
++	@if [ ! -f $(UHUB_CONF_DIR)/rules.txt ]; then touch $(UHUB_CONF_DIR)/rules.txt; fi
  	@echo done.
  endif
  
diff -ruN --exclude=CVS /usr/ports/net-p2p/uhub.orig/pkg-plist /usr/ports/net-p2p/uhub/pkg-plist
--- /usr/ports/net-p2p/uhub.orig/pkg-plist	2010-06-02 09:15:17.000000000 +0400
+++ /usr/ports/net-p2p/uhub/pkg-plist	2010-06-02 09:47:20.000000000 +0400
@@ -8,4 +8,7 @@
 @unexec if cmp -s %D/etc/uhub/motd.txt.sample %D/etc/uhub/motd.txt; then rm -f %D/etc/uhub/motd.txt; fi
 etc/uhub/motd.txt.sample
 @exec if [ ! -f %D/etc/uhub/motd.txt ] ; then cp -p %D/%F %B/uhub/motd.txt; fi
+@unexec if cmp -s %D/etc/uhub/rules.txt.sample %D/etc/uhub/rules.txt; then rm -f %D/etc/uhub/rules.txt; fi
+etc/uhub/rules.txt.sample
+@exec if [ ! -f %D/etc/uhub/rules.txt ] ; then cp -p %D/%F %B/uhub/rules.txt; fi
 @dirrmtry etc/uhub


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Jun 2 15:09:10 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147308 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/147308: commit references a PR
Date: Wed,  2 Jun 2010 15:11:50 +0000 (UTC)

 pav         2010-06-02 15:11:37 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-p2p/uhub         Makefile distinfo pkg-plist 
     net-p2p/uhub/files   patch-GNUmakefile 
   Log:
   - Update to 0.3.2
   
   PR:             ports/147308
   Submitted by:   Dmitry Yashin <yashin.dm@gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.4       +4 -1      ports/net-p2p/uhub/Makefile
   1.4       +3 -3      ports/net-p2p/uhub/distinfo
   1.4       +4 -3      ports/net-p2p/uhub/files/patch-GNUmakefile
   1.2       +3 -0      ports/net-p2p/uhub/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
