From jihuang@gnu.iis.sinica.edu.tw  Sat Dec 20 12:02:43 2003
Return-Path: <jihuang@gnu.iis.sinica.edu.tw>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EB2FD16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Dec 2003 12:02:42 -0800 (PST)
Received: from gnu.iis.sinica.edu.tw (gnu.iis.sinica.edu.tw [140.109.17.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6971543D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Dec 2003 12:02:39 -0800 (PST)
	(envelope-from jihuang@gnu.iis.sinica.edu.tw)
Received: from gnu.iis.sinica.edu.tw (localhost [127.0.0.1])
	by gnu.iis.sinica.edu.tw (8.12.9p1/8.12.9) with ESMTP id hBKEOigQ031724
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Dec 2003 22:24:44 +0800 (CST)
	(envelope-from jihuang@gnu.iis.sinica.edu.tw)
Received: (from jihuang@localhost)
	by gnu.iis.sinica.edu.tw (8.12.9p1/8.12.9/Submit) id hBKEOhDK031723;
	Sat, 20 Dec 2003 22:24:43 +0800 (CST)
Message-Id: <200312201424.hBKEOhDK031723@gnu.iis.sinica.edu.tw>
Date: Sat, 20 Dec 2003 22:24:43 +0800 (CST)
From: June-Yen Huang <jihuang@gate.sinica.edu.tw>
Reply-To: June-Yen Huang <jihuang@gate.sinica.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: ports memcached update
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         60428
>Category:       ports
>Synopsis:       ports memcached update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    seanc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 20 12:10:06 PST 2003
>Closed-Date:    Mon May 31 06:28:29 PDT 2004
>Last-Modified:  Mon May 31 06:28:29 PDT 2004
>Originator:     June-Yen Huang
>Release:        FreeBSD 5.1-RELEASE-p11 i386
>Organization:
>Environment:
System: FreeBSD gnu.iis.sinica.edu.tw 5.1-RELEASE-p11 FreeBSD 5.1-RELEASE-p11 #1: Fri Dec 12 03:26:49 CST 2003 root@gnu.iis.sinica.edu.tw:/usr/obj/usr/src/sys/SMP i386


>Description:
	memcached upgrade from 1.1.8 to 1.1.9
>How-To-Repeat:
	skip
>Fix:

	just change Makefile and distfile , rm patches in files
	1.1.9 works fine , without remove malloc.h , and determine if
	mlockall(2) available , 

	the diff is in below

diff -urN --exclude=.svn /usr/ports/databases/memcached/Makefile memcached/Makefile
--- /usr/ports/databases/memcached/Makefile	Fri Aug 22 02:20:43 2003
+++ memcached/Makefile	Sat Dec 20 21:33:52 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	memcached
-PORTVERSION=	1.1.8
+PORTVERSION=	1.1.9
 CATEGORIES=	databases
 MASTER_SITES=	http://www.danga.com/memcached/dist/
 
diff -urN --exclude=.svn /usr/ports/databases/memcached/distinfo memcached/distinfo
--- /usr/ports/databases/memcached/distinfo	Fri Aug 22 02:20:43 2003
+++ memcached/distinfo	Sat Dec 20 21:07:15 2003
@@ -1 +1 @@
-MD5 (memcached-1.1.8.tar.gz) = ee7302df1b634beedccae3a97e5d207b
+MD5 (memcached-1.1.9.tar.gz) = a91d1d7c200dcceb6babe01763d9e0ff
diff -urN --exclude=.svn /usr/ports/databases/memcached/files/patch-Makefile.am memcached/files/patch-Makefile.am
--- /usr/ports/databases/memcached/files/patch-Makefile.am	Tue Jul 22 14:16:06 2003
+++ memcached/files/patch-Makefile.am	Thu Jan  1 08:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.am.orig	Mon Jul 21 23:04:08 2003
-+++ Makefile.am	Mon Jul 21 23:04:18 2003
-@@ -5,6 +5,7 @@
- DIST_SUBDIRS = website api
- EXTRA_DIST = website api
- 
--CFLAGS=-g -O2 -static -DNDEBUG
-+CFLAGS=-g -O2 -static -DNDEBUG @LIBEVENT_CFLAGS@
-+LDFLAGS=@LIBEVENT_LDFLAGS@
- 
- 
diff -urN --exclude=.svn /usr/ports/databases/memcached/files/patch-assoc.c memcached/files/patch-assoc.c
--- /usr/ports/databases/memcached/files/patch-assoc.c	Tue Jul 22 14:16:06 2003
+++ memcached/files/patch-assoc.c	Thu Jan  1 08:00:00 1970
@@ -1,10 +0,0 @@
---- assoc.c.orig	Mon Jul 21 22:58:06 2003
-+++ assoc.c	Mon Jul 21 22:58:11 2003
-@@ -28,7 +28,6 @@
- #include <netinet/in.h>
- #include <errno.h>
- #include <event.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #include "memcached.h"
diff -urN --exclude=.svn /usr/ports/databases/memcached/files/patch-configure.ac memcached/files/patch-configure.ac
--- /usr/ports/databases/memcached/files/patch-configure.ac	Tue Jul 22 14:16:06 2003
+++ memcached/files/patch-configure.ac	Thu Jan  1 08:00:00 1970
@@ -1,23 +0,0 @@
---- configure.ac.orig	Mon Jul 21 23:03:01 2003
-+++ configure.ac	Mon Jul 21 23:03:38 2003
-@@ -20,9 +20,20 @@
- 	AC_MSG_RESULT(yes)
- fi
- 
-+AC_ARG_WITH(libevent,[  --with-libevent=PREFIX  Prefix where libevent is installed], libevent_prefix="$withval", libevent_prefix="")
-+LIBEVENT_LDFLAGS="-L$libevent_prefix/lib"
-+LIBEVENT_CFLAGS="-I$libevent_prefix/include"
-+
-+LDFLAGS="$LIBEVENT_LDFLAGS"
-+CFLAGS="$LIBEVENT_CFLAGS"
-+LDADD="$LIBEVENT_LDFLAGS"
-+
- LIBEVENT_URL=http://www.monkey.org/~provos/libevent/
- AC_CHECK_LIB(event, event_set, ,
- 	[AC_MSG_ERROR(libevent is required.  You can get it from $LIBEVENT_URL)])
-+
-+AC_SUBST(LIBEVENT_LDFLAGS)
-+AC_SUBST(LIBEVENT_CFLAGS)
- 
- AC_CONFIG_FILES(Makefile)
- AC_OUTPUT
diff -urN --exclude=.svn /usr/ports/databases/memcached/files/patch-items.c memcached/files/patch-items.c
--- /usr/ports/databases/memcached/files/patch-items.c	Fri Aug 22 02:20:44 2003
+++ memcached/files/patch-items.c	Thu Jan  1 08:00:00 1970
@@ -1,10 +0,0 @@
---- items.c.orig	Thu Aug 21 11:05:52 2003
-+++ items.c	Thu Aug 21 11:05:56 2003
-@@ -17,7 +17,6 @@
- #include <errno.h>
- #include <time.h>
- #include <event.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #include "memcached.h"
diff -urN --exclude=.svn /usr/ports/databases/memcached/files/patch-memcached.c memcached/files/patch-memcached.c
--- /usr/ports/databases/memcached/files/patch-memcached.c	Fri Aug 22 02:20:44 2003
+++ memcached/files/patch-memcached.c	Thu Jan  1 08:00:00 1970
@@ -1,75 +0,0 @@
---- memcached.c.orig	Tue Jul 29 22:43:57 2003
-+++ memcached.c	Thu Aug 21 11:18:45 2003
-@@ -34,7 +34,6 @@
- #include <errno.h>
- #include <time.h>
- #include <event.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #include "memcached.h"
-@@ -314,26 +313,6 @@
-         return;
-     }
- 
--    if (strcmp(command, "stats malloc") == 0) {
--        char temp[512];
--        struct mallinfo info;
--        char *pos = temp;
--
--        info = mallinfo();
--        pos += sprintf(pos, "STAT arena_size %d\r\n", info.arena);
--        pos += sprintf(pos, "STAT free_chunks %d\r\n", info.ordblks);
--        pos += sprintf(pos, "STAT fastbin_blocks %d\r\n", info.smblks);
--        pos += sprintf(pos, "STAT mmapped_regions %d\r\n", info.hblks);
--        pos += sprintf(pos, "STAT mmapped_space %d\r\n", info.hblkhd);
--        pos += sprintf(pos, "STAT max_total_alloc %d\r\n", info.usmblks);
--        pos += sprintf(pos, "STAT fastbin_space %d\r\n", info.fsmblks);
--        pos += sprintf(pos, "STAT total_alloc %d\r\n", info.uordblks);
--        pos += sprintf(pos, "STAT total_free %d\r\n", info.fordblks);
--        pos += sprintf(pos, "STAT releasable_space %d\r\nEND", info.keepcost);
--        out_string(c, temp);
--        return;
--    }
--
-     if (strcmp(command, "stats maps") == 0) {
-         char *wbuf;
-         int wsize = 8192; /* should be enough */
-@@ -1114,7 +1093,6 @@
-     printf("-d            run as a daemon\n");
-     printf("-m <num>      max memory to use for items in megabytes, default is 64 MB\n");
-     printf("-c <num>      max simultaneous connections, default is 1024\n");
--    printf("-k            lock down all paged memory\n");
-     printf("-v            verbose (print errors/warnings while in event loop)\n");
-     printf("-h            print this help and exit\n");
-     printf("-i            print memcached and libevent license\n");
-@@ -1198,7 +1176,6 @@
-     int c;
-     conn *l_conn;
-     struct in_addr addr;
--    int lock_memory = 0;
-     int daemonize = 0;
- 
-     /* init settings */
-@@ -1222,9 +1199,6 @@
-         case 'i':
-             usage_license();
-             exit(0);
--        case 'k':
--            lock_memory = 1;
--            break;
-         case 'v':
-             settings.verbose = 1;
-             break;
-@@ -1261,11 +1235,6 @@
-             fprintf(stderr, "failed to daemon() in order to daemonize\n");
-             return 1;
-         }
--    }
--
--    /* lock paged memory if needed */
--    if (lock_memory) {
--        mlockall(MCL_CURRENT | MCL_FUTURE);
-     }
- 
-     /* create the listening socket and bind it */
diff -urN --exclude=.svn /usr/ports/databases/memcached/files/patch-slabs.c memcached/files/patch-slabs.c
--- /usr/ports/databases/memcached/files/patch-slabs.c	Tue Jul 22 14:16:06 2003
+++ memcached/files/patch-slabs.c	Thu Jan  1 08:00:00 1970
@@ -1,10 +0,0 @@
---- slabs.c.orig	Mon Jul 21 23:08:11 2003
-+++ slabs.c	Mon Jul 21 23:08:18 2003
-@@ -20,7 +20,6 @@
- #include <netinet/in.h>
- #include <errno.h>
- #include <event.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #include "memcached.h"

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->seanc 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sat Dec 20 15:40:53 PST 2003 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60428 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon May 31 06:28:16 PDT 2004 
State-Changed-Why:  
This port seems to be already at 1.1.10 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60428 
>Unformatted:
