From owner-freebsd-apache@FreeBSD.ORG Mon Oct 31 01:35:28 2011 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 092841065745; Mon, 31 Oct 2011 01:35:28 +0000 (UTC) (envelope-from takefu@airport.fm) Received: from ae-osaka.co.jp (unknown [IPv6:2001:3e0:4ec:a000::1]) by mx1.freebsd.org (Postfix) with ESMTP id 0846B8FC1B; Mon, 31 Oct 2011 01:35:27 +0000 (UTC) Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1]) by ae-osaka.co.jp (Postfix) with ESMTP id D84951144B; Mon, 31 Oct 2011 10:35:25 +0900 (JST) X-Virus-Scanned: amavisd-new at ae-osaka.co.jp Received: from ae-osaka.co.jp ([127.0.0.1]) by ae-osaka.co.jp (ae-osaka.co.jp [127.0.0.1]) (amavisd-new, port 10024) with LMTP id qU8H8y4yMwRx; Mon, 31 Oct 2011 10:35:25 +0900 (JST) Received: from [IPv6:2001:3e0:4ec:a011:a524:9394:80d3:c42] (unknown [IPv6:2001:3e0:4ec:a011:a524:9394:80d3:c42]) by ae-osaka.co.jp (Postfix) with ESMTPSA id 8820A11458; Mon, 31 Oct 2011 10:35:25 +0900 (JST) Message-ID: <4EADFB5C.4020307@airport.fm> Date: Mon, 31 Oct 2011 10:35:24 +0900 From: Takefu User-Agent: Mozilla/5.0 (Windows NT 6.0; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: linimon@FreeBSD.org References: <201110291131.p9TBVVv6032598@freefall.freebsd.org> In-Reply-To: <201110291131.p9TBVVv6032598@freefall.freebsd.org> X-Enigmail-Version: 1.3.2 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: apache@FreeBSD.org Subject: Re: ports/162080: [PATCH] devel/apr1: Improved decision IPv6 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: takefu@airport.fm List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2011 01:35:28 -0000 たけふ＠大阪豊中です。 clang と cc と入れ替えた場合、 configure 実行中の IPv6 判定箇所で、 判定プログラムがコンパイル出来ず、 判定出来ないことが原因。 The judgment program cannot be compiled in the IPv6 judgment part executing configure when replacing it with clang and cc, and not being possible to judge are the causes. > --- work.CC/apr-1.4.5/config.log > +++ work.CLANG/apr-1.4.5/config.log > configure:27712: checking for working getaddrinfo > -configure:27757: cc -o conftest -g -O2 conftest.c -lcrypt -pthread >&5 > -conftest.c: In function 'main': > -conftest.c:215: warning: incompatible implicit declaration of built-in function 'exit' > -conftest.c:218: warning: incompatible implicit declaration of built-in function 'exit' > -conftest.c:220: warning: incompatible implicit declaration of built-in function 'exit' > -conftest.c:206: warning: return type of 'main' is not 'int' > -configure:27757: $? = 0 > -configure:27757: ./conftest > -configure:27757: $? = 0 > -configure:27771: result: yes > +configure:27757: /usr/local/bin/clang -o conftest -g -O2 conftest.c -lcrypt -pthread >&5 > +conftest.c:206:1: error: 'main' must return 'int' > +void main(void) { > +^ > +conftest.c:215:9: warning: implicitly declaring C library function 'exit' with type 'void (int) __attribute__((noreturn))' > + exit(1); > + ^ > +conftest.c:215:9: note: please include the header or explicitly provide a declaration for 'exit' > +1 warning and 1 error generated. > +configure:27757: $? = 1 > +configure: program exited with status 1 > +configure: failed program was: > +| /* confdefs.h */ > +| #define PACKAGE_NAME "" > +| #define PACKAGE_TARNAME "" > +| #define PACKAGE_VERSION "" > +| #define PACKAGE_STRING "" > +| #define PACKAGE_BUGREPORT "" > +| #define PACKAGE_URL "" > +| #define STDC_HEADERS 1 > +| #define HAVE_SYS_TYPES_H 1 > +| #define HAVE_SYS_STAT_H 1 > +| #define HAVE_STDLIB_H 1 > +| #define HAVE_STRING_H 1 > +| #define HAVE_MEMORY_H 1 > +| #define HAVE_STRINGS_H 1 > +| #define HAVE_INTTYPES_H 1 > +| #define HAVE_STDINT_H 1 > +| #define HAVE_UNISTD_H 1 > +| #define __EXTENSIONS__ 1 > +| #define _ALL_SOURCE 1 > +| #define _GNU_SOURCE 1 > +| #define _POSIX_PTHREAD_SEMANTICS 1 > +| #define _TANDEM_SOURCE 1 > +| #define HAVE_DLFCN_H 1 > +| #define LT_OBJDIR ".libs/" > +| #define HAVE_ATOMIC_BUILTINS 1 > +| #define HAVE_PTHREAD_H 1 > +| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1 > +| #define HAVE_PTHREAD_KEY_DELETE 1 > +| #define HAVE_PTHREAD_RWLOCK_INIT 1 > +| #define HAVE_PTHREAD_ATTR_SETGUARDSIZE 1 > +| #define HAVE_PTHREAD_YIELD 1 > +| #define HAVE_PTHREAD_RWLOCKS 1 > +| #define HAVE_GETHOSTBYNAME_R 1 > +| #define HAVE_GETHOSTBYADDR_R 1 > +| #define HAVE_GETSERVBYNAME_R 1 > +| #define HAVE_SIGSUSPEND 1 > +| #define HAVE_SIGWAIT 1 > +| #define HAVE_POLL 1 > +| #define HAVE_KQUEUE 1 > +| #define HAVE_GETPWNAM_R 1 > +| #define HAVE_GETPWUID_R 1 > +| #define HAVE_GETGRNAM_R 1 > +| #define HAVE_GETGRGID_R 1 > +| #define HAVE_SYS_TYPES_H 1 > +| #define HAVE_SYS_MMAN_H 1 > +| #define HAVE_SYS_IPC_H 1 > +| #define HAVE_SYS_MUTEX_H 1 > +| #define HAVE_SYS_SHM_H 1 > +| #define HAVE_SYS_FILE_H 1 > +| #define HAVE_MMAP 1 > +| #define HAVE_MUNMAP 1 > +| #define HAVE_SHM_OPEN 1 > +| #define HAVE_SHM_UNLINK 1 > +| #define HAVE_SHMGET 1 > +| #define HAVE_SHMAT 1 > +| #define HAVE_SHMDT 1 > +| #define HAVE_SHMCTL 1 > +| #define HAVE_MAP_ANON 1 > +| #define anonymous shared memory allocation method 1 > +| #define USE_SHMEM_MMAP_ANON 1 > +| #define namebased memory allocation method 1 > +| #define USE_SHMEM_SHMGET 1 > +| #define HAVE_ALLOCA 1 > +| #define HAVE_CALLOC 1 > +| #define HAVE_SETSID 1 > +| #define HAVE_ISINF 1 > +| #define HAVE_ISNAN 1 > +| #define HAVE_GETENV 1 > +| #define HAVE_PUTENV 1 > +| #define HAVE_SETENV 1 > +| #define HAVE_UNSETENV 1 > +| #define HAVE_WRITEV 1 > +| #define HAVE_GETIFADDRS 1 > +| #define HAVE_UTIME 1 > +| #define HAVE_UTIMES 1 > +| #define HAVE_SETRLIMIT 1 > +| #define HAVE_GETRLIMIT 1 > +| #define HAVE_SENDFILE 1 > +| #define HAVE_SIGACTION 1 > +| #define HAVE_DECL_SYS_SIGLIST 1 > +| #define HAVE_FORK 1 > +| #define HAVE_STRERROR_R 1 > +| #define STRERROR_R_RC_INT 1 > +| #define HAVE_MMAP 1 > +| #define HAVE_MEMMOVE 1 > +| #define HAVE_GETPASS 1 > +| #define HAVE_GMTIME_R 1 > +| #define HAVE_LOCALTIME_R 1 > +| #define HAVE_MKSTEMP 1 > +| #define STDC_HEADERS 1 > +| #define HAVE_CTYPE_H 1 > +| #define HAVE_DIRENT_H 1 > +| #define HAVE_DLFCN_H 1 > +| #define HAVE_ERRNO_H 1 > +| #define HAVE_FCNTL_H 1 > +| #define HAVE_GRP_H 1 > +| #define HAVE_LIMITS_H 1 > +| #define HAVE_MEMORY_H 1 > +| #define HAVE_NETDB_H 1 > +| #define HAVE_OSRELDATE_H 1 > +| #define HAVE_POLL_H 1 > +| #define HAVE_PWD_H 1 > +| #define HAVE_SEMAPHORE_H 1 > +| #define HAVE_SIGNAL_H 1 > +| #define HAVE_STDARG_H 1 > +| #define HAVE_STDDEF_H 1 > +| #define HAVE_STDIO_H 1 > +| #define HAVE_STDLIB_H 1 > +| #define HAVE_STRING_H 1 > +| #define HAVE_STRINGS_H 1 > +| #define HAVE_TERMIOS_H 1 > +| #define HAVE_TIME_H 1 > +| #define HAVE_UNISTD_H 1 > +| #define HAVE_ARPA_INET_H 1 > +| #define HAVE_NETINET_IN_H 1 > +| #define HAVE_NETINET_SCTP_H 1 > +| #define HAVE_NETINET_SCTP_UIO_H 1 > +| #define HAVE_SYS_FILE_H 1 > +| #define HAVE_SYS_IOCTL_H 1 > +| #define HAVE_SYS_MMAN_H 1 > +| #define HAVE_SYS_PARAM_H 1 > +| #define HAVE_SYS_POLL_H 1 > +| #define HAVE_SYS_RESOURCE_H 1 > +| #define HAVE_SYS_SELECT_H 1 > +| #define HAVE_SYS_SEM_H 1 > +| #define HAVE_SYS_SIGNAL_H 1 > +| #define HAVE_SYS_SOCKET_H 1 > +| #define HAVE_SYS_SOCKIO_H 1 > +| #define HAVE_SYS_STAT_H 1 > +| #define HAVE_SYS_SYSCTL_H 1 > +| #define HAVE_SYS_SYSLIMITS_H 1 > +| #define HAVE_SYS_TIME_H 1 > +| #define HAVE_SYS_TYPES_H 1 > +| #define HAVE_SYS_UIO_H 1 > +| #define HAVE_SYS_UN_H 1 > +| #define HAVE_SYS_WAIT_H 1 > +| #define HAVE_NETINET_TCP_H 1 > +| #define HAVE_SOCKLEN_T 1 > +| #define SIZEOF_VOIDP 8 > +| #define SIZEOF_CHAR 1 > +| #define SIZEOF_INT 4 > +| #define SIZEOF_LONG 8 > +| #define SIZEOF_SHORT 2 > +| #define SIZEOF_LONG_LONG 8 > +| #define SIZEOF_PID_T 4 > +| #define SIZEOF_SSIZE_T 8 > +| #define SIZEOF_SIZE_T 8 > +| #define SIZEOF_OFF_T 8 > +| #define SIZEOF_INO_T 4 > +| #define SIZEOF_STRUCT_IOVEC 16 > +| #define HAVE_STRNCASECMP 1 > +| #define HAVE_STRCASECMP 1 > +| #define HAVE_STRDUP 1 > +| #define HAVE_STRSTR 1 > +| #define HAVE_MEMCHR 1 > +| #define APR_INT64_STRFN strtol > +| #define APR_OFF_T_STRFN strtol > +| #define DSO_USE_DLFCN 1 > +| #define HAVE_WAITPID 1 > +| #define HAVE_VLA 1 > +| #define HAVE_SEMGET 1 > +| #define HAVE_SEMCTL 1 > +| #define HAVE_FLOCK 1 > +| #define HAVE_SEMAPHORE_H 1 > +| #define HAVE_SEM_CLOSE 1 > +| #define HAVE_SEM_UNLINK 1 > +| #define HAVE_SEM_POST 1 > +| #define HAVE_SEM_WAIT 1 > +| #define HAVE_LOCK_EX 1 > +| #define HAVE_F_SETLK 1 > +| #define HAVE_SEM_UNDO 1 > +| #define HAVE_POLLIN 1 > +| #define HAVE_PTHREAD_PROCESS_SHARED 1 > +| #define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1 > +| #define apr_lock implementation method 1 > +| #define USE_FLOCK_SERIALIZE 1 > +| #define DEV_RANDOM "/dev/urandom" > +| #define HAVE_STRUCT_STAT_ST_BLOCKS 1 > +| #define DIRENT_INODE d_fileno > +| #define DIRENT_TYPE d_type > +| #define HAVE_UUID_H 1 > +| #define HAVE_UUID_CREATE 1 > +| #define HAVE_STRUCT_TM_TM_GMTOFF 1 > +| #define WAITIO_USES_POLL 1 > +| #define GETHOSTBYNAME_R_GLIBC2 1 > +| #define GETSERVBYNAME_R_GLIBC2 1 > +| #define HAVE_TCP_NOPUSH 1 > +| #define HAVE_SO_ACCEPTFILTER 1 > +| #define HAVE_STRUCT_IPMREQ 1 > +| #define HAVE_GAI_STRERROR 1 > +| /* end confdefs.h. */ > +| > +| #ifdef HAVE_NETDB_H > +| #include > +| #endif > +| #ifdef HAVE_STRING_H > +| #include > +| #endif > +| #ifdef HAVE_SYS_TYPES_H > +| #include > +| #endif > +| #ifdef HAVE_SYS_SOCKET_H > +| #include > +| #endif > +| > +| void main(void) { > +| struct addrinfo hints, *ai; > +| int error; > +| > +| memset(&hints, 0, sizeof(hints)); > +| hints.ai_family = AF_UNSPEC; > +| hints.ai_socktype = SOCK_STREAM; > +| error = getaddrinfo("127.0.0.1", NULL, &hints, &ai); > +| if (error) { > +| exit(1); > +| } > +| if (ai->ai_addr->sa_family != AF_INET) { > +| exit(1); > +| } > +| exit(0); > +| } > +| > +configure:27771: result: no > configure:27784: checking for negative error codes for getaddrinfo > -configure:27810: cc -o conftest -g -O2 conftest.c -lcrypt -pthread >&5 > -conftest.c: In function 'main': > -conftest.c:199: error: 'EAI_ADDRFAMILY' undeclared (first use in this function) > -conftest.c:199: error: (Each undeclared identifier is reported only once > -conftest.c:199: error: for each function it appears in.) > -conftest.c:200: warning: incompatible implicit declaration of built-in function 'exit' > -conftest.c:202: warning: incompatible implicit declaration of built-in function 'exit' > -conftest.c:198: warning: return type of 'main' is not 'int' > +configure:27810: /usr/local/bin/clang -o conftest -g -O2 conftest.c -lcrypt -pthread >&5 > +conftest.c:197:1: error: 'main' must return 'int' > +void main(void) { > +^ > +conftest.c:198:9: error: use of undeclared identifier 'EAI_ADDRFAMILY' > + if (EAI_ADDRFAMILY < 0) { > + ^ > +conftest.c:199:9: warning: implicitly declaring C library function 'exit' with type 'void (int) __attribute__((noreturn))' > + exit(0); > + ^ > +conftest.c:199:9: note: please include the header or explicitly provide a declaration for 'exit' > +1 warning and 2 errors generated. > configure:27810: $? = 1 > configure: program exited with status 1 > configure: failed program was: > @@ -16892,7 +17562,6 @@ > | #define HAVE_SO_ACCEPTFILTER 1 > | #define HAVE_STRUCT_IPMREQ 1 > | #define HAVE_GAI_STRERROR 1 > -| #define HAVE_GETADDRINFO 1 > | /* end confdefs.h. */ > | > | #ifdef HAVE_NETDB_H > @@ -16908,43 +17577,278 @@ > | > configure:27824: result: no > configure:27833: checking for working getnameinfo > -configure:27886: cc -o conftest -g -O2 conftest.c -lcrypt -pthread >&5 > -conftest.c: In function 'main': > -conftest.c:226: warning: incompatible implicit declaration of built-in function 'exit' > -conftest.c:228: warning: incompatible implicit declaration of built-in function 'exit' > -conftest.c:210: warning: return type of 'main' is not 'int' > -configure:27886: $? = 0 > -configure:27886: ./conftest > -configure:27886: $? = 0 > -configure:27900: result: yes > +configure:27886: /usr/local/bin/clang -o conftest -g -O2 conftest.c -lcrypt -pthread >&5 > +conftest.c:209:1: error: 'main' must return 'int' > +void main(void) { > +^ > +conftest.c:216:26: warning: implicit declaration of function 'inet_addr' is invalid in C99 [-Wimplicit-function-declaration] > + sa.sin_addr.s_addr = inet_addr("127.0.0.1"); > + ^ > +conftest.c:225:9: warning: implicitly declaring C library function 'exit' with type 'void (int) __attribute__((noreturn))' > + exit(1); > + ^ > +conftest.c:225:9: note: please include the header or explicitly provide a declaration for 'exit' > +2 warnings and 1 error generated. > +configure:27886: $? = 1 > +configure: program exited with status 1 > +configure: failed program was: > +| /* confdefs.h */ > +| #define PACKAGE_NAME "" > +| #define PACKAGE_TARNAME "" > +| #define PACKAGE_VERSION "" > +| #define PACKAGE_STRING "" > +| #define PACKAGE_BUGREPORT "" > +| #define PACKAGE_URL "" > +| #define STDC_HEADERS 1 > +| #define HAVE_SYS_TYPES_H 1 > +| #define HAVE_SYS_STAT_H 1 > +| #define HAVE_STDLIB_H 1 > +| #define HAVE_STRING_H 1 > +| #define HAVE_MEMORY_H 1 > +| #define HAVE_STRINGS_H 1 > +| #define HAVE_INTTYPES_H 1 > +| #define HAVE_STDINT_H 1 > +| #define HAVE_UNISTD_H 1 > +| #define __EXTENSIONS__ 1 > +| #define _ALL_SOURCE 1 > +| #define _GNU_SOURCE 1 > +| #define _POSIX_PTHREAD_SEMANTICS 1 > +| #define _TANDEM_SOURCE 1 > +| #define HAVE_DLFCN_H 1 > +| #define LT_OBJDIR ".libs/" > +| #define HAVE_ATOMIC_BUILTINS 1 > +| #define HAVE_PTHREAD_H 1 > +| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1 > +| #define HAVE_PTHREAD_KEY_DELETE 1 > +| #define HAVE_PTHREAD_RWLOCK_INIT 1 > +| #define HAVE_PTHREAD_ATTR_SETGUARDSIZE 1 > +| #define HAVE_PTHREAD_YIELD 1 > +| #define HAVE_PTHREAD_RWLOCKS 1 > +| #define HAVE_GETHOSTBYNAME_R 1 > +| #define HAVE_GETHOSTBYADDR_R 1 > +| #define HAVE_GETSERVBYNAME_R 1 > +| #define HAVE_SIGSUSPEND 1 > +| #define HAVE_SIGWAIT 1 > +| #define HAVE_POLL 1 > +| #define HAVE_KQUEUE 1 > +| #define HAVE_GETPWNAM_R 1 > +| #define HAVE_GETPWUID_R 1 > +| #define HAVE_GETGRNAM_R 1 > +| #define HAVE_GETGRGID_R 1 > +| #define HAVE_SYS_TYPES_H 1 > +| #define HAVE_SYS_MMAN_H 1 > +| #define HAVE_SYS_IPC_H 1 > +| #define HAVE_SYS_MUTEX_H 1 > +| #define HAVE_SYS_SHM_H 1 > +| #define HAVE_SYS_FILE_H 1 > +| #define HAVE_MMAP 1 > +| #define HAVE_MUNMAP 1 > +| #define HAVE_SHM_OPEN 1 > +| #define HAVE_SHM_UNLINK 1 > +| #define HAVE_SHMGET 1 > +| #define HAVE_SHMAT 1 > +| #define HAVE_SHMDT 1 > +| #define HAVE_SHMCTL 1 > +| #define HAVE_MAP_ANON 1 > +| #define anonymous shared memory allocation method 1 > +| #define USE_SHMEM_MMAP_ANON 1 > +| #define namebased memory allocation method 1 > +| #define USE_SHMEM_SHMGET 1 > +| #define HAVE_ALLOCA 1 > +| #define HAVE_CALLOC 1 > +| #define HAVE_SETSID 1 > +| #define HAVE_ISINF 1 > +| #define HAVE_ISNAN 1 > +| #define HAVE_GETENV 1 > +| #define HAVE_PUTENV 1 > +| #define HAVE_SETENV 1 > +| #define HAVE_UNSETENV 1 > +| #define HAVE_WRITEV 1 > +| #define HAVE_GETIFADDRS 1 > +| #define HAVE_UTIME 1 > +| #define HAVE_UTIMES 1 > +| #define HAVE_SETRLIMIT 1 > +| #define HAVE_GETRLIMIT 1 > +| #define HAVE_SENDFILE 1 > +| #define HAVE_SIGACTION 1 > +| #define HAVE_DECL_SYS_SIGLIST 1 > +| #define HAVE_FORK 1 > +| #define HAVE_STRERROR_R 1 > +| #define STRERROR_R_RC_INT 1 > +| #define HAVE_MMAP 1 > +| #define HAVE_MEMMOVE 1 > +| #define HAVE_GETPASS 1 > +| #define HAVE_GMTIME_R 1 > +| #define HAVE_LOCALTIME_R 1 > +| #define HAVE_MKSTEMP 1 > +| #define STDC_HEADERS 1 > +| #define HAVE_CTYPE_H 1 > +| #define HAVE_DIRENT_H 1 > +| #define HAVE_DLFCN_H 1 > +| #define HAVE_ERRNO_H 1 > +| #define HAVE_FCNTL_H 1 > +| #define HAVE_GRP_H 1 > +| #define HAVE_LIMITS_H 1 > +| #define HAVE_MEMORY_H 1 > +| #define HAVE_NETDB_H 1 > +| #define HAVE_OSRELDATE_H 1 > +| #define HAVE_POLL_H 1 > +| #define HAVE_PWD_H 1 > +| #define HAVE_SEMAPHORE_H 1 > +| #define HAVE_SIGNAL_H 1 > +| #define HAVE_STDARG_H 1 > +| #define HAVE_STDDEF_H 1 > +| #define HAVE_STDIO_H 1 > +| #define HAVE_STDLIB_H 1 > +| #define HAVE_STRING_H 1 > +| #define HAVE_STRINGS_H 1 > +| #define HAVE_TERMIOS_H 1 > +| #define HAVE_TIME_H 1 > +| #define HAVE_UNISTD_H 1 > +| #define HAVE_ARPA_INET_H 1 > +| #define HAVE_NETINET_IN_H 1 > +| #define HAVE_NETINET_SCTP_H 1 > +| #define HAVE_NETINET_SCTP_UIO_H 1 > +| #define HAVE_SYS_FILE_H 1 > +| #define HAVE_SYS_IOCTL_H 1 > +| #define HAVE_SYS_MMAN_H 1 > +| #define HAVE_SYS_PARAM_H 1 > +| #define HAVE_SYS_POLL_H 1 > +| #define HAVE_SYS_RESOURCE_H 1 > +| #define HAVE_SYS_SELECT_H 1 > +| #define HAVE_SYS_SEM_H 1 > +| #define HAVE_SYS_SIGNAL_H 1 > +| #define HAVE_SYS_SOCKET_H 1 > +| #define HAVE_SYS_SOCKIO_H 1 > +| #define HAVE_SYS_STAT_H 1 > +| #define HAVE_SYS_SYSCTL_H 1 > +| #define HAVE_SYS_SYSLIMITS_H 1 > +| #define HAVE_SYS_TIME_H 1 > +| #define HAVE_SYS_TYPES_H 1 > +| #define HAVE_SYS_UIO_H 1 > +| #define HAVE_SYS_UN_H 1 > +| #define HAVE_SYS_WAIT_H 1 > +| #define HAVE_NETINET_TCP_H 1 > +| #define HAVE_SOCKLEN_T 1 > +| #define SIZEOF_VOIDP 8 > +| #define SIZEOF_CHAR 1 > +| #define SIZEOF_INT 4 > +| #define SIZEOF_LONG 8 > +| #define SIZEOF_SHORT 2 > +| #define SIZEOF_LONG_LONG 8 > +| #define SIZEOF_PID_T 4 > +| #define SIZEOF_SSIZE_T 8 > +| #define SIZEOF_SIZE_T 8 > +| #define SIZEOF_OFF_T 8 > +| #define SIZEOF_INO_T 4 > +| #define SIZEOF_STRUCT_IOVEC 16 > +| #define HAVE_STRNCASECMP 1 > +| #define HAVE_STRCASECMP 1 > +| #define HAVE_STRDUP 1 > +| #define HAVE_STRSTR 1 > +| #define HAVE_MEMCHR 1 > +| #define APR_INT64_STRFN strtol > +| #define APR_OFF_T_STRFN strtol > +| #define DSO_USE_DLFCN 1 > +| #define HAVE_WAITPID 1 > +| #define HAVE_VLA 1 > +| #define HAVE_SEMGET 1 > +| #define HAVE_SEMCTL 1 > +| #define HAVE_FLOCK 1 > +| #define HAVE_SEMAPHORE_H 1 > +| #define HAVE_SEM_CLOSE 1 > +| #define HAVE_SEM_UNLINK 1 > +| #define HAVE_SEM_POST 1 > +| #define HAVE_SEM_WAIT 1 > +| #define HAVE_LOCK_EX 1 > +| #define HAVE_F_SETLK 1 > +| #define HAVE_SEM_UNDO 1 > +| #define HAVE_POLLIN 1 > +| #define HAVE_PTHREAD_PROCESS_SHARED 1 > +| #define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1 > +| #define apr_lock implementation method 1 > +| #define USE_FLOCK_SERIALIZE 1 > +| #define DEV_RANDOM "/dev/urandom" > +| #define HAVE_STRUCT_STAT_ST_BLOCKS 1 > +| #define DIRENT_INODE d_fileno > +| #define DIRENT_TYPE d_type > +| #define HAVE_UUID_H 1 > +| #define HAVE_UUID_CREATE 1 > +| #define HAVE_STRUCT_TM_TM_GMTOFF 1 > +| #define WAITIO_USES_POLL 1 > +| #define GETHOSTBYNAME_R_GLIBC2 1 > +| #define GETSERVBYNAME_R_GLIBC2 1 > +| #define HAVE_TCP_NOPUSH 1 > +| #define HAVE_SO_ACCEPTFILTER 1 > +| #define HAVE_STRUCT_IPMREQ 1 > +| #define HAVE_GAI_STRERROR 1 > +| /* end confdefs.h. */ > +| > +| #ifdef HAVE_NETDB_H > +| #include > +| #endif > +| #ifdef HAVE_STRING_H > +| #include > +| #endif > +| #ifdef HAVE_SYS_TYPES_H > +| #include > +| #endif > +| #ifdef HAVE_SYS_SOCKET_H > +| #include > +| #endif > +| #ifdef HAVE_NETINET_IN_H > +| #include > +| #endif > +| > +| void main(void) { > +| struct sockaddr_in sa; > +| char hbuf[256]; > +| int error; > +| > +| sa.sin_family = AF_INET; > +| sa.sin_port = 0; > +| sa.sin_addr.s_addr = inet_addr("127.0.0.1"); > +| #ifdef SIN6_LEN > +| sa.sin_len = sizeof(sa); > +| #endif > +| > +| error = getnameinfo((const struct sockaddr *)&sa, sizeof(sa), > +| hbuf, 256, NULL, 0, > +| NI_NUMERICHOST); > +| if (error) { > +| exit(1); > +| } else { > +| exit(0); > +| } > +| } > +| > +configure:27900: result: no linimon@FreeBSD.org さんは書きました (2011/10/29 20:31): > As an APR committer and apache@ member can you explain to me what > problem you are trying to solve and what specific version of the board > you have ? -- From owner-freebsd-apache@FreeBSD.ORG Mon Oct 31 11:06:17 2011 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D6A11065672 for ; Mon, 31 Oct 2011 11:06:17 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 13CBD8FC22 for ; Mon, 31 Oct 2011 11:06:17 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9VB6Gx8056103 for ; Mon, 31 Oct 2011 11:06:16 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9VB6G4W056101 for apache@FreeBSD.org; Mon, 31 Oct 2011 11:06:16 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 31 Oct 2011 11:06:16 GMT Message-Id: <201110311106.p9VB6G4W056101@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: apache@FreeBSD.org Cc: Subject: Current problem reports assigned to apache@FreeBSD.org X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2011 11:06:17 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- f ports/162080 apache [PATCH] devel/apr1: Improved decision IPv6 o ports/161758 apache www/mod_rpaf2: slave seperation and Apache22+ limitati o ports/160702 apache devel/apr1: CLANG build produces unusable library for o ports/159812 apache [PATCH] www/apache20,www/apache22 Strip Binaries o ports/159661 apache [maintainer] Minor cleanup to www/mod_macro22 o ports/159608 apache www/apache22: apache WITH_BDB_BASE settings described o ports/158565 apache www/apache22: Add rlimits based on login class for mpm f ports/158544 apache Port www/mod_perl2 fails to build o ports/157554 apache www/apache22: Apache RLimitNPROC does not work as inte o ports/156987 apache www/apache22: Harden SSL cipher suites strength and SS o ports/156787 apache www/mod_auth_kerb2 fails on undefined symbol with base f ports/156719 apache ab: apr_socket_recv: Connection reset by peer (54) o ports/156251 apache [PATCH] Enable module by default for www/mod_fastcgi o ports/153406 apache www/apache22's SUEXEC_RSRCLIMIT option does not take e o ports/153264 apache www/apache22 and apache13-modssl -- rc.d script improv o ports/147806 apache [PATCH] www/apache20: httpd doesn't start with WITH_LD o ports/147282 apache errors when starting www/apache22 after installation o o ports/146199 apache www/apache20: port does not use make config o ports/144010 apache devel/apr1 tries to use SYSVIPC even in jails o ports/130479 apache www/apache20 and www/apache22 configure_args busted o ports/125183 apache www/apache22 wrong SUEXEC_DOCROOT o ports/124375 apache security/heimdal: www/mod_auth_kerb doesn't compile ag s ports/108169 apache www/apache20 wrong AP_SAFE_PATH for suEXEC 23 problems total. From owner-freebsd-apache@FreeBSD.ORG Wed Nov 2 09:47:12 2011 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6266106564A; Wed, 2 Nov 2011 09:47:12 +0000 (UTC) (envelope-from takefu@airport.fm) Received: from ae-osaka.co.jp (unknown [IPv6:2001:3e0:4ec:a000::1]) by mx1.freebsd.org (Postfix) with ESMTP id 5E0D08FC18; Wed, 2 Nov 2011 09:47:11 +0000 (UTC) Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1]) by ae-osaka.co.jp (Postfix) with ESMTP id 7158A1147B; Wed, 2 Nov 2011 18:47:09 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=airport.fm; h= message-id:date:from:mime-version:cc:subject:references :in-reply-to:content-type:content-transfer-encoding; s=mail; bh= ghqgcrMONvyqnZl3dGGVDylAwOg=; b=Xq2ggBbRDCVFIEHtg9xxAjd2JfX6Va9u cOLUFw1GUaeU/GFiIhXEO40QL10LrYuvBwuG+frVn7hqnhaUccfHje9ajd3wIrjm u6Xp0H0tWNU1zM5ZqoNZ/ZQQwLQhVFwx7QyTMseB7aheULt+TMdAGQf7n+KoG1ZK KcBU9ZDVkVs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=airport.fm; h=message-id :date:from:mime-version:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; q=dns; s=mail; b=jszDq9 yduxJO3Rw87oiLBwFP5/gBfHk+/1QgD583U8YWvssOeLRT64y7QvqsjX4LrDF5N1 dXCDkyHhoLtNzkfGze8MaJHW6k+bVIjyveCbzluXVI+thVEaCYZ2gBnHByXNX2JT s1+pAj2teAOCvEFOomgEeIEIXgJQizT8Cyrf8= Received: from [IPv6:2001:3e0:4ec:a011:a524:9394:80d3:c42] (unknown [IPv6:2001:3e0:4ec:a011:a524:9394:80d3:c42]) by ae-osaka.co.jp (Postfix) with ESMTPSA id 49E7A11478; Wed, 2 Nov 2011 18:47:09 +0900 (JST) Message-ID: <4EB1119C.6090500@airport.fm> Date: Wed, 02 Nov 2011 18:47:08 +0900 From: Takefu User-Agent: Mozilla/5.0 (Windows NT 6.0; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 References: <201108160842.p7G8gaBi034167@dhcp-releng6> <4E4A3088.5000506@airport.fm> <20110816100705.GA15451@icarus.home.lan> <4E4A445C.9070803@airport.fm> In-Reply-To: <4E4A445C.9070803@airport.fm> X-Enigmail-Version: 1.3.2 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: freebsd-gnats-submit@freebsd.org, apache@FreeBSD.org Subject: Re: [PATCH] www/apache20,www/apache22 Strip Binaries X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2011 09:47:12 -0000 I attached a toggle. By default, not STRIP. Common items add options WITH_STRIP apache20 Only. fix Security ADVISORY CVE-2011-3192 http://httpd.apache.org/security/CVE-2011-3192.txt --- apache20.patch begins here --- diff -ruN /usr/ports/www/apache20/Makefile www/apache20/Makefile --- /usr/ports/www/apache20/Makefile 2011-09-29 14:04:37.000000000 +0900 +++ www/apache20/Makefile 2011-11-02 16:54:04.000000000 +0900 @@ -64,6 +64,16 @@ MPM_ITK_VERSION?= 20061030-01 +PATCH_SITES+= ${MASTER_SITE_APACHE_HTTPD:S!$!patches/apply_to_2.0.64/!} +PATCHFILES+= CVE-2011-3192-2.0.64-byterange-fixes.patch + +.if defined(WITH_STRIP) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-build__instdso.sh\ + ${FILESDIR}/extra-STRIP-patch-build__rules.mk.in +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-NOSTRIP-patch-build__rules.mk.in +.endif + .if defined(WITH_SUEXEC_RSRCLIMIT) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit .if !defined(WITH_SUEXEC) diff -ruN /usr/ports/www/apache20/distinfo www/apache20/distinfo --- /usr/ports/www/apache20/distinfo 2011-03-21 14:19:27.000000000 +0900 +++ www/apache20/distinfo 2011-11-02 11:46:01.000000000 +0900 @@ -2,3 +2,5 @@ SIZE (apache2/httpd-2.0.64.tar.bz2) = 4954766 SHA256 (apache2/powerlogo.gif) = 0144675a80761b9660bdb652d331d9ba3bebdff89c0fa35a56aa463662a53254 SIZE (apache2/powerlogo.gif) = 5279 +SHA256 (apache2/CVE-2011-3192-2.0.64-byterange-fixes.patch) = 055d48f6fd3e57223a88fe3e63e081171b490400e91d7951af1f6371f73d96cb +SIZE (apache2/CVE-2011-3192-2.0.64-byterange-fixes.patch) = 19920 diff -ruN /usr/ports/www/apache20/files/extra-NOSTRIP-patch-build__rules.mk.in www/apache20/files/extra-NOSTRIP-patch-build__rules.mk.in --- /usr/ports/www/apache20/files/extra-NOSTRIP-patch-build__rules.mk.in 1970-01-01 09:00:00.000000000 +0900 +++ www/apache20/files/extra-NOSTRIP-patch-build__rules.mk.in 2010-05-07 08:10:19.000000000 +0900 @@ -0,0 +1,11 @@ +--- ./build/rules.mk.in.orig 2006-07-12 03:40:55.000000000 -0400 ++++ ./build/rules.mk.in 2010-05-06 16:06:03.734831750 -0400 +@@ -45,7 +45,7 @@ + + LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ + SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ +-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ ++MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ + + # Cross compile commands + diff -ruN /usr/ports/www/apache20/files/extra-STRIP-patch-build__rules.mk.in www/apache20/files/extra-STRIP-patch-build__rules.mk.in --- /usr/ports/www/apache20/files/extra-STRIP-patch-build__rules.mk.in 1970-01-01 09:00:00.000000000 +0900 +++ www/apache20/files/extra-STRIP-patch-build__rules.mk.in 2011-08-16 17:04:02.000000000 +0900 @@ -0,0 +1,21 @@ +--- build/rules.mk.in.orig 2006-07-12 16:40:55.000000000 +0900 ++++ build/rules.mk.in 2011-08-16 17:03:28.000000000 +0900 +@@ -45,7 +45,7 @@ + + LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ + SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ +-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ ++MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ + + # Cross compile commands + +@@ -54,7 +54,8 @@ + MKINSTALLDIRS = $(abs_srcdir)/build/mkdir.sh + INSTALL = $(LIBTOOL) --mode=install $(abs_srcdir)/build/install.sh -c + INSTALL_DATA = $(INSTALL) -m 644 +-INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS) ++INSTALL_PROGRAM = $(INSTALL) -s -m 755 $(INSTALL_PROG_FLAGS) ++INSTALL_SCRIPT = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS) + + # + # Standard build rules diff -ruN /usr/ports/www/apache20/files/extra-patch-build__instdso.sh www/apache20/files/extra-patch-build__instdso.sh --- /usr/ports/www/apache20/files/extra-patch-build__instdso.sh 1970-01-01 09:00:00.000000000 +0900 +++ www/apache20/files/extra-patch-build__instdso.sh 2011-08-16 17:04:24.000000000 +0900 @@ -0,0 +1,11 @@ +--- build/instdso.sh.orig 2006-07-12 16:40:55.000000000 +0900 ++++ build/instdso.sh 2011-08-16 17:02:40.000000000 +0900 +@@ -49,7 +49,7 @@ + $CMD || exit $? + fi + +-CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/" ++CMD="$SH_LIBTOOL --mode=install install -s $DSOARCHIVE $TARGETDIR/" + echo $CMD + $CMD || exit $? + diff -ruN /usr/ports/www/apache20/files/patch-build__rules.mk.in www/apache20/files/patch-build__rules.mk.in --- /usr/ports/www/apache20/files/patch-build__rules.mk.in 2010-05-07 08:10:19.000000000 +0900 +++ www/apache20/files/patch-build__rules.mk.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- ./build/rules.mk.in.orig 2006-07-12 03:40:55.000000000 -0400 -+++ ./build/rules.mk.in 2010-05-06 16:06:03.734831750 -0400 -@@ -45,7 +45,7 @@ - - LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ - SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ --MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ -+MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ - - # Cross compile commands - --- apache20.patch ends here --- --- apache22.patch begins here --- diff -ruN /usr/ports/www/apache22/Makefile www/apache22/Makefile --- /usr/ports/www/apache22/Makefile 2011-09-29 14:04:37.000000000 +0900 +++ www/apache22/Makefile 2011-11-02 14:34:01.000000000 +0900 @@ -63,6 +63,14 @@ .include "${APACHEDIR}/Makefile.options" .endif +.if defined(WITH_STRIP) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-build__instdso.sh\ + ${FILESDIR}/extra-patch-build__rules.mk.in\ + ${FILESDIR}/extra-STRIP-patch-Makefile.in +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-NOSTRIP-patch-Makefile.in +.endif + .if defined(WITH_SUEXEC_RSRCLIMIT) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit .if !defined(WITH_SUEXEC) diff -ruN /usr/ports/www/apache22/files/extra-NOSTRIP-patch-Makefile.in www/apache22/files/extra-NOSTRIP-patch-Makefile.in --- /usr/ports/www/apache22/files/extra-NOSTRIP-patch-Makefile.in 1970-01-01 09:00:00.000000000 +0900 +++ www/apache22/files/extra-NOSTRIP-patch-Makefile.in 2010-05-07 12:15:44.000000000 +0900 @@ -0,0 +1,115 @@ +--- ./Makefile.in.orig 2008-11-25 15:24:49.000000000 -0500 ++++ ./Makefile.in 2010-05-06 19:37:54.211730130 -0400 +@@ -31,9 +31,11 @@ + install-conf: + @echo Installing configuration files + @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra +- @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra ++ @$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) $(DESTDIR)$(EXAMPLESDIR)/extra ++ + @cd $(top_srcdir)/docs/conf; \ + for i in mime.types magic; do \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(EXAMPLESDIR); \ + if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ + fi; \ +@@ -69,14 +71,14 @@ + -e 's#@@SSLPort@@#$(SSLPORT)#g' \ + < $$i; \ + fi \ +- ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ +- chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ ++ ) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \ ++ chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \ + file=$$i; \ + if [ "$$i" = "httpd.conf" ]; then \ + file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ + fi; \ + if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ +- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ ++ $(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ + fi; \ + fi; \ + done ; \ +@@ -120,48 +122,29 @@ + doxygen $(top_srcdir)/docs/doxygen.conf + + install-htdocs: +- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ +- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ +- else \ +- echo Installing HTML documents ; \ ++ @echo Installing HTML documents ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ +- if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ +- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \ +- else \ +- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ +- cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ +- fi; \ +- fi ++ $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \ ++ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \ ++ ( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true + + install-error: +- -@if [ -d $(DESTDIR)$(errordir) ]; then \ +- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \ +- else \ +- echo Installing error documents ; \ ++ @echo Installing error documents ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ + cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ +- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ +- fi ++ test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; + + install-icons: +- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \ +- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \ +- else \ +- echo Installing icons ; \ ++ @echo Installing icons ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ + cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ +- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ +- fi ++ test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; + + install-cgi: +- -@if [ -d $(DESTDIR)$(cgidir) ];then \ +- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ +- else \ +- echo Installing CGIs ; \ ++ @echo Installing CGIs ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ +- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ +- fi ++ test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; + + install-other: + @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) +@@ -208,14 +191,20 @@ + @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 + @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 + @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) +- @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 +- @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 ++ for i in dbmmanage htdbm htdigest htpasswd; do \ ++ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.1 $(DESTDIR)$(mandir)/man1; \ ++ done ++ for i in ab apachectl apxs htcacheclean httpd logresolve rotatelogs suexec; do \ ++ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.8 $(DESTDIR)$(mandir)/man8; \ ++ done ++.if !defined(NOPORTDOCS) + @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ + $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ + else \ + cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ + cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ + fi ++.endif + + install-suexec: + @if test -f $(builddir)/support/suexec; then \ diff -ruN /usr/ports/www/apache22/files/extra-STRIP-patch-Makefile.in www/apache22/files/extra-STRIP-patch-Makefile.in --- /usr/ports/www/apache22/files/extra-STRIP-patch-Makefile.in 1970-01-01 09:00:00.000000000 +0900 +++ www/apache22/files/extra-STRIP-patch-Makefile.in 2011-08-16 16:26:21.000000000 +0900 @@ -0,0 +1,124 @@ +--- Makefile.in.orig 2008-11-26 05:24:49.000000000 +0900 ++++ Makefile.in 2011-08-16 16:25:58.000000000 +0900 +@@ -31,9 +31,11 @@ + install-conf: + @echo Installing configuration files + @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra +- @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra ++ @$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) $(DESTDIR)$(EXAMPLESDIR)/extra ++ + @cd $(top_srcdir)/docs/conf; \ + for i in mime.types magic; do \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(EXAMPLESDIR); \ + if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ + fi; \ +@@ -69,14 +71,14 @@ + -e 's#@@SSLPort@@#$(SSLPORT)#g' \ + < $$i; \ + fi \ +- ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ +- chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ ++ ) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \ ++ chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \ + file=$$i; \ + if [ "$$i" = "httpd.conf" ]; then \ + file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ + fi; \ + if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ +- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ ++ $(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ + fi; \ + fi; \ + done ; \ +@@ -101,7 +103,7 @@ + @for f in $(top_builddir)/config.nice \ + $(top_srcdir)/build/mkdir.sh \ + $(top_srcdir)/build/instdso.sh; do \ +- $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \ ++ $(INSTALL_SCRIPT) $$f $(DESTDIR)$(installbuilddir); \ + done + @$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk + @rm build/config_vars.out +@@ -120,48 +122,29 @@ + doxygen $(top_srcdir)/docs/doxygen.conf + + install-htdocs: +- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ +- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ +- else \ +- echo Installing HTML documents ; \ ++ @echo Installing HTML documents ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ +- if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ +- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \ +- else \ +- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ +- cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ +- fi; \ +- fi ++ $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \ ++ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \ ++ ( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true + + install-error: +- -@if [ -d $(DESTDIR)$(errordir) ]; then \ +- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \ +- else \ +- echo Installing error documents ; \ ++ @echo Installing error documents ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ + cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ +- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ +- fi ++ test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; + + install-icons: +- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \ +- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \ +- else \ +- echo Installing icons ; \ ++ @echo Installing icons ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ + cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ +- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ +- fi ++ test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; + + install-cgi: +- -@if [ -d $(DESTDIR)$(cgidir) ];then \ +- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ +- else \ +- echo Installing CGIs ; \ ++ @echo Installing CGIs ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ + cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ +- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ +- fi ++ test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; + + install-other: + @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) +@@ -208,14 +191,20 @@ + @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 + @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 + @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) +- @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 +- @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 ++ for i in dbmmanage htdbm htdigest htpasswd; do \ ++ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.1 $(DESTDIR)$(mandir)/man1; \ ++ done ++ for i in ab apachectl apxs htcacheclean httpd logresolve rotatelogs suexec; do \ ++ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.8 $(DESTDIR)$(mandir)/man8; \ ++ done ++.if !defined(NOPORTDOCS) + @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ + $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ + else \ + cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ + cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ + fi ++.endif + + install-suexec: + @if test -f $(builddir)/support/suexec; then \ diff -ruN /usr/ports/www/apache22/files/extra-patch-build__instdso.sh www/apache22/files/extra-patch-build__instdso.sh --- /usr/ports/www/apache22/files/extra-patch-build__instdso.sh 1970-01-01 09:00:00.000000000 +0900 +++ www/apache22/files/extra-patch-build__instdso.sh 2011-08-16 16:57:40.000000000 +0900 @@ -0,0 +1,11 @@ +--- build/instdso.sh.orig 2006-07-12 12:38:44.000000000 +0900 ++++ build/instdso.sh 2011-08-16 16:57:13.000000000 +0900 +@@ -49,7 +49,7 @@ + $CMD || exit $? + fi + +-CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/" ++CMD="$SH_LIBTOOL --mode=install install -s $DSOARCHIVE $TARGETDIR/" + echo $CMD + $CMD || exit $? + diff -ruN /usr/ports/www/apache22/files/extra-patch-build__rules.mk.in www/apache22/files/extra-patch-build__rules.mk.in --- /usr/ports/www/apache22/files/extra-patch-build__rules.mk.in 1970-01-01 09:00:00.000000000 +0900 +++ www/apache22/files/extra-patch-build__rules.mk.in 2011-08-16 16:09:05.000000000 +0900 @@ -0,0 +1,12 @@ +--- build/rules.mk.in.orig 2006-07-12 12:38:44.000000000 +0900 ++++ build/rules.mk.in 2011-08-16 16:09:01.000000000 +0900 +@@ -55,7 +55,8 @@ + # Helper programs + + INSTALL_DATA = $(INSTALL) -m 644 +-INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS) ++INSTALL_PROGRAM = $(INSTALL) -s -m 755 $(INSTALL_PROG_FLAGS) ++INSTALL_SCRIPT = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS) + + # + # Standard build rules diff -ruN /usr/ports/www/apache22/files/patch-Makefile.in www/apache22/files/patch-Makefile.in --- /usr/ports/www/apache22/files/patch-Makefile.in 2010-05-07 12:15:44.000000000 +0900 +++ www/apache22/files/patch-Makefile.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,115 +0,0 @@ ---- ./Makefile.in.orig 2008-11-25 15:24:49.000000000 -0500 -+++ ./Makefile.in 2010-05-06 19:37:54.211730130 -0400 -@@ -31,9 +31,11 @@ - install-conf: - @echo Installing configuration files - @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra -- @$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra -+ @$(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) $(DESTDIR)$(EXAMPLESDIR)/extra -+ - @cd $(top_srcdir)/docs/conf; \ - for i in mime.types magic; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(EXAMPLESDIR); \ - if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ - fi; \ -@@ -69,14 +71,14 @@ - -e 's#@@SSLPort@@#$(SSLPORT)#g' \ - < $$i; \ - fi \ -- ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ -- chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ -+ ) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \ -+ chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \ - file=$$i; \ - if [ "$$i" = "httpd.conf" ]; then \ - file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ - fi; \ - if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ -- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ -+ $(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ - fi; \ - fi; \ - done ; \ -@@ -120,48 +122,29 @@ - doxygen $(top_srcdir)/docs/doxygen.conf - - install-htdocs: -- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \ -- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \ -- else \ -- echo Installing HTML documents ; \ -+ @echo Installing HTML documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \ -- if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ -- $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \ -- else \ -- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \ -- cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi; \ -- fi -+ $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \ -+ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \ -+ ( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true - - install-error: -- -@if [ -d $(DESTDIR)$(errordir) ]; then \ -- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \ -- else \ -- echo Installing error documents ; \ -+ @echo Installing error documents ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ - cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \ -- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+ test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; - - install-icons: -- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \ -- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \ -- else \ -- echo Installing icons ; \ -+ @echo Installing icons ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ - cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \ -- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+ test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; - - install-cgi: -- -@if [ -d $(DESTDIR)$(cgidir) ];then \ -- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \ -- else \ -- echo Installing CGIs ; \ -+ @echo Installing CGIs ; \ - $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ - cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \ -- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ -- fi -+ test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; - - install-other: - @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -208,14 +191,20 @@ - @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 - @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 - @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) -- @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 -- @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 -+ for i in dbmmanage htdbm htdigest htpasswd; do \ -+ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.1 $(DESTDIR)$(mandir)/man1; \ -+ done -+ for i in ab apachectl apxs htcacheclean httpd logresolve rotatelogs suexec; do \ -+ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.8 $(DESTDIR)$(mandir)/man8; \ -+ done -+.if !defined(NOPORTDOCS) - @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ - $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ - else \ - cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ - cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi -+.endif - - install-suexec: - @if test -f $(builddir)/support/suexec; then \ --- apache22.patch ends here --- From owner-freebsd-apache@FreeBSD.ORG Wed Nov 2 10:04:20 2011 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B12C106566C; Wed, 2 Nov 2011 10:04:20 +0000 (UTC) (envelope-from takefu@airport.fm) Received: from ae-osaka.co.jp (unknown [IPv6:2001:3e0:4ec:a000::1]) by mx1.freebsd.org (Postfix) with ESMTP id 7992D8FC16; Wed, 2 Nov 2011 10:04:19 +0000 (UTC) Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1]) by ae-osaka.co.jp (Postfix) with ESMTP id A88DD11482; Wed, 2 Nov 2011 19:04:18 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=airport.fm; h= message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; s=mail; bh= ngynunMJiQ50nttDil5erZ4wKlg=; b=CD7DaWqAnyl0Kx2QoqruguJv7HqD4IWq 3M1bvbR329H+/aOG3yT8xTOaATktoTu1SaFZyUXx/YGgQOVdhebOZXg9u1zOwbDz tC+j5oOIpTK8wMQBkOH858re9ZqT5cvNSXuKgPdpHjoox8PkwlBd86irYu9Awzw/ JqbckIll3rw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=airport.fm; h=message-id :date:from:mime-version:to:subject:references:in-reply-to :content-type:content-transfer-encoding; q=dns; s=mail; b=QRKpvJ LrcZikdF0yuAhvwiUHzBWNT8ttdGbqixIoWfrju4HFwrbHFUrGfVrdnLQF+S9jtc Uf9zeF1nAl7o+YcjIa4umN3KuX1BfZrVkOH5HxZ5NoM5iql9SQXM5Olv6h1OSIdv 4kAyqauzhAxfSetKkUPvZNyVYCM4E8dxvUMBk= Received: from [IPv6:2001:3e0:4ec:a011:a524:9394:80d3:c42] (unknown [IPv6:2001:3e0:4ec:a011:a524:9394:80d3:c42]) by ae-osaka.co.jp (Postfix) with ESMTPSA id 84C341147D; Wed, 2 Nov 2011 19:04:18 +0900 (JST) Message-ID: <4EB115A2.10307@airport.fm> Date: Wed, 02 Nov 2011 19:04:18 +0900 From: Takefu User-Agent: Mozilla/5.0 (Windows NT 6.0; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: freebsd-gnats-submit@freebsd.org, apache@FreeBSD.org References: <201110280518.p9S5IeA7033986@unbound.local.ae-osaka.co.jp> In-Reply-To: <201110280518.p9S5IeA7033986@unbound.local.ae-osaka.co.jp> X-Enigmail-Version: 1.3.2 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: Subject: [UPDATE] devel/apr0: Update 0.9.20 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2011 10:04:20 -0000 >Category: ports >Synopsis: [UPDATE] devel/apr0: Update 0.9.20 >Confidential: no >Severity: non-critical >Priority: low >Class: change-request >Submitter-Id: current-users >Originator: Takefu >Release: FreeBSD 8.2-RELEASE-p3 amd64 >Organization: FOX Amateur Radio Club >Environment: >Description: Update to 0.9.19 -> 0.9.20 Ensure correct IPv6 failure in specific environments. Port maintainer (apache@FreeBSD.org) is cc'd. >Fix: --- apr0.patch begins here --- diff -ruN /usr/ports/devel/apr0/Makefile devel/apr0/Makefile --- /usr/ports/devel/apr0/Makefile 2011-09-29 14:00:57.000000000 +0900 +++ devel/apr0/Makefile 2011-11-02 17:55:38.000000000 +0900 @@ -30,7 +30,7 @@ NDBM "Enable NDBM support in apr-util" off \ DEVRANDOM "Use /dev/random or compatible in apr" on -APR_VERSION= 0.9.19 +APR_VERSION= 0.9.20 APU_VERSION= 0.9.19 NO_LATEST_LINK= yes @@ -122,6 +122,8 @@ ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \ ${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \ ${APU_WRKDIR}/build/apu-conf.m4 + ${REINPLACE_CMD} -e 's,void main(void),int main(void),'\ + ${APR_WRKDIR}/build/apr_network.m4 run-autotools:: cd ${APR_WRKDIR} ; \ diff -ruN /usr/ports/devel/apr0/distinfo devel/apr0/distinfo --- /usr/ports/devel/apr0/distinfo 2011-07-04 09:05:55.000000000 +0900 +++ devel/apr0/distinfo 2011-11-02 17:19:45.000000000 +0900 @@ -1,4 +1,4 @@ -SHA256 (apr-0.9.19.tar.gz) = bd2124a53fdc2a3ff2868554bef6381b96a1f9e0bdb20d1a71dbe5497025c8e4 -SIZE (apr-0.9.19.tar.gz) = 1068153 +SHA256 (apr-0.9.20.tar.gz) = db9feb30dedb916d7a4d893336e20df8c01bdfa65b4eeb36ad7c3d763860a76e +SIZE (apr-0.9.20.tar.gz) = 1084515 SHA256 (apr-util-0.9.19.tar.gz) = 9ffa9f5a1a0d2eddddd1c114e99a8f5e49aa8018db6f0bc6eeab4724d9eaa085 SIZE (apr-util-0.9.19.tar.gz) = 591729 diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh --- /usr/ports/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh 2010-10-21 06:16:45.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- ./apr-0.9.19/build/buildcheck.sh.orig 2004-11-24 23:10:04.000000000 +0000 -+++ ./apr-0.9.19/build/buildcheck.sh 2010-10-20 21:08:11.853623919 +0000 -@@ -26,7 +26,7 @@ - # output is multiline from 1.5 onwards - - # Require libtool 1.3.3 or newer --libtool=`build/PrintPath glibtool libtool` -+libtool=${LIBTOOL} - lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` - if test -z "$lt_pversion"; then - echo "buildconf: libtool not found." diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.19__buildconf devel/apr0/files/patch-apr-0.9.19__buildconf --- /usr/ports/devel/apr0/files/patch-apr-0.9.19__buildconf 2010-10-21 06:16:45.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.19__buildconf 1970-01-01 09:00:00.000000000 +0900 @@ -1,75 +0,0 @@ ---- ./apr-0.9.19/buildconf.orig 2006-09-20 16:04:09.000000000 +0000 -+++ ./apr-0.9.19/buildconf 2010-10-20 21:08:11.863623823 +0000 -@@ -23,7 +23,7 @@ - # - build/buildcheck.sh || exit 1 - --libtoolize=`build/PrintPath glibtoolize libtoolize` -+libtoolize="${LIBTOOLIZE}" - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -@@ -35,29 +35,48 @@ - # Note: APR supplies its own config.guess and config.sub -- we do not - # rely on libtool's versions - # --echo "Copying libtool helper files ..." -+echo "buildconf: copying libtool helper files using $libtoolize" - - # Remove any libtool files so one can switch between libtool 1.3 - # and libtool 1.4 by simply rerunning the buildconf script. --(cd build ; rm -f ltconfig ltmain.sh libtool.m4) -- --$libtoolize --copy --automake -- --ltpath=`dirname $libtoolize` --ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) - --if [ ! -f $ltfile ]; then -+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -+lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -+IFS=.; set $lt_version; IFS=' ' -+if test "$1" = "1"; then -+ $libtoolize --copy --automake -+ if [ -f libtool.m4 ]; then -+ ltfile=`pwd`/libtool.m4 -+ else -+ ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ -+ < $libtoolize`" -+ ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} -+ # Expecting the code above to be very portable, but just in case... -+ if [ -z "$ltfile" -o ! -f "$ltfile" ]; then -+ ltpath=`dirname $libtoolize` -+ ltfile=${LIBTOOL_M4} -+ fi -+ fi -+ if [ ! -f $ltfile ]; then - echo "$ltfile not found" - exit 1 -+ fi -+ # Do we need this anymore? -+ echo "buildconf: Using libtool.m4 at ${ltfile}." -+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -+fi -+if test "$1" = "2"; then -+ $libtoolize --copy -+ # Wouldn't it just be better to define top_builddir?? -+ mv build/libtool.m4 build/libtool.m4.$$ -+ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -+ chmod 664 build/libtool.m4.$$ -+ rm build/libtool.m4.$$ - fi - --echo "buildconf: Using libtool.m4 at ${ltfile}." -- --cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -- --# This is just temporary until people's workspaces are cleared -- remove --# any old aclocal.m4 left over from prior build so it doesn't cause errors. --rm -f aclocal.m4 -+# Clean up any leftovers -+rm -f aclocal.m4 libtool.m4 - - # - # Generate the autoconf header and ./configure diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.19__config.layout devel/apr0/files/patch-apr-0.9.19__config.layout --- /usr/ports/devel/apr0/files/patch-apr-0.9.19__config.layout 2010-10-21 06:16:45.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.19__config.layout 1970-01-01 09:00:00.000000000 +0900 @@ -1,10 +0,0 @@ ---- ./apr-0.9.19/config.layout.orig 2004-11-24 23:02:04.000000000 +0000 -+++ ./apr-0.9.19/config.layout 2010-10-20 21:08:11.854622653 +0000 -@@ -229,3 +229,7 @@ - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - -+ -+ -+ libsuffix: -+ diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.19__configure.in devel/apr0/files/patch-apr-0.9.19__configure.in --- /usr/ports/devel/apr0/files/patch-apr-0.9.19__configure.in 2010-10-21 06:16:45.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.19__configure.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,43 +0,0 @@ ---- ./apr-0.9.19/configure.in.orig 2008-06-20 17:32:47.000000000 +0000 -+++ ./apr-0.9.19/configure.in 2010-10-20 21:08:11.857624440 +0000 -@@ -7,6 +7,7 @@ - AC_INIT(build/apr_common.m4) - AC_CONFIG_HEADER(include/arch/unix/apr_private.h) - AC_CONFIG_AUX_DIR(build) -+AC_CONFIG_MACRO_DIR(build) - - dnl - dnl Include our own M4 macros along with those for libtool -@@ -16,6 +17,11 @@ - sinclude(build/apr_threads.m4) - sinclude(build/apr_hints.m4) - sinclude(build/libtool.m4) -+sinclude(build/ltsugar.m4) -+sinclude(build/argz.m4) -+sinclude(build/ltoptions.m4) -+sinclude(build/ltversion.m4) -+sinclude(build/lt~obsolete.m4) - - dnl Save user-defined environment settings for later restoration - dnl -@@ -98,6 +104,8 @@ - dnl preload section from invoking the macro to get compiler info. - AC_PROG_CC - -+AC_PROG_SED -+ - dnl Preload - APR_PRELOAD - -@@ -141,6 +149,11 @@ - AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental custom libtool (not included in source distribution)], - [experimental_libtool=$enableval],[experimental_libtool=no]) - -+dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL -+if test "x$Xsed" = "x"; then -+ Xsed="$SED -e 1s/^X//" -+fi -+ - case $host in - *os2*) - # Use a custom-made libtool replacement diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c --- /usr/ports/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c 2010-10-21 06:16:45.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,18 +0,0 @@ ---- ./apr-0.9.19/threadproc/unix/procsup.c.orig 2006-09-20 16:04:09.000000000 +0000 -+++ ./apr-0.9.19/threadproc/unix/procsup.c 2010-10-20 21:08:11.859622744 +0000 -@@ -21,6 +21,7 @@ - int x; - - chdir("/"); -+#ifndef FREEBSD_THREAD_HACK - #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS) - /* Don't detach for MPE because child processes can't survive the death of - * the parent. */ -@@ -56,6 +57,7 @@ - return errno; - } - #endif -+#endif - - /* close out the standard file descriptors */ - if (freopen("/dev/null", "r", stdin) == NULL) { diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.20__build__buildcheck.sh devel/apr0/files/patch-apr-0.9.20__build__buildcheck.sh --- /usr/ports/devel/apr0/files/patch-apr-0.9.20__build__buildcheck.sh 1970-01-01 09:00:00.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.20__build__buildcheck.sh 2011-11-02 17:32:34.000000000 +0900 @@ -0,0 +1,11 @@ +--- ./apr-0.9.20/build/buildcheck.sh.orig 2004-11-24 23:10:04.000000000 +0000 ++++ ./apr-0.9.20/build/buildcheck.sh 2010-10-20 21:08:11.853623919 +0000 +@@ -26,7 +26,7 @@ + # output is multiline from 1.5 onwards + + # Require libtool 1.3.3 or newer +-libtool=`build/PrintPath glibtool libtool` ++libtool=${LIBTOOL} + lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` + if test -z "$lt_pversion"; then + echo "buildconf: libtool not found." diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.20__buildconf devel/apr0/files/patch-apr-0.9.20__buildconf --- /usr/ports/devel/apr0/files/patch-apr-0.9.20__buildconf 1970-01-01 09:00:00.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.20__buildconf 2011-11-02 17:32:56.000000000 +0900 @@ -0,0 +1,75 @@ +--- ./apr-0.9.20/buildconf.orig 2006-09-20 16:04:09.000000000 +0000 ++++ ./apr-0.9.20/buildconf 2010-10-20 21:08:11.863623823 +0000 +@@ -23,7 +23,7 @@ + # + build/buildcheck.sh || exit 1 + +-libtoolize=`build/PrintPath glibtoolize libtoolize` ++libtoolize="${LIBTOOLIZE}" + if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +@@ -35,29 +35,48 @@ + # Note: APR supplies its own config.guess and config.sub -- we do not + # rely on libtool's versions + # +-echo "Copying libtool helper files ..." ++echo "buildconf: copying libtool helper files using $libtoolize" + + # Remove any libtool files so one can switch between libtool 1.3 + # and libtool 1.4 by simply rerunning the buildconf script. +-(cd build ; rm -f ltconfig ltmain.sh libtool.m4) +- +-$libtoolize --copy --automake +- +-ltpath=`dirname $libtoolize` +-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} ++(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) + +-if [ ! -f $ltfile ]; then ++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` ++lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` ++IFS=.; set $lt_version; IFS=' ' ++if test "$1" = "1"; then ++ $libtoolize --copy --automake ++ if [ -f libtool.m4 ]; then ++ ltfile=`pwd`/libtool.m4 ++ else ++ ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ ++ < $libtoolize`" ++ ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} ++ # Expecting the code above to be very portable, but just in case... ++ if [ -z "$ltfile" -o ! -f "$ltfile" ]; then ++ ltpath=`dirname $libtoolize` ++ ltfile=${LIBTOOL_M4} ++ fi ++ fi ++ if [ ! -f $ltfile ]; then + echo "$ltfile not found" + exit 1 ++ fi ++ # Do we need this anymore? ++ echo "buildconf: Using libtool.m4 at ${ltfile}." ++ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++fi ++if test "$1" = "2"; then ++ $libtoolize --copy ++ # Wouldn't it just be better to define top_builddir?? ++ mv build/libtool.m4 build/libtool.m4.$$ ++ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++ chmod 664 build/libtool.m4.$$ ++ rm build/libtool.m4.$$ + fi + +-echo "buildconf: Using libtool.m4 at ${ltfile}." +- +-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 +- +-# This is just temporary until people's workspaces are cleared -- remove +-# any old aclocal.m4 left over from prior build so it doesn't cause errors. +-rm -f aclocal.m4 ++# Clean up any leftovers ++rm -f aclocal.m4 libtool.m4 + + # + # Generate the autoconf header and ./configure diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.20__config.layout devel/apr0/files/patch-apr-0.9.20__config.layout --- /usr/ports/devel/apr0/files/patch-apr-0.9.20__config.layout 1970-01-01 09:00:00.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.20__config.layout 2011-11-02 17:32:56.000000000 +0900 @@ -0,0 +1,10 @@ +--- ./apr-0.9.20/config.layout.orig 2004-11-24 23:02:04.000000000 +0000 ++++ ./apr-0.9.20/config.layout 2010-10-20 21:08:11.854622653 +0000 +@@ -229,3 +229,7 @@ + infodir: ${exec_prefix}/share/info + libsuffix: -${APR_MAJOR_VERSION} + ++ ++ ++ libsuffix: ++ diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.20__configure.in devel/apr0/files/patch-apr-0.9.20__configure.in --- /usr/ports/devel/apr0/files/patch-apr-0.9.20__configure.in 1970-01-01 09:00:00.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.20__configure.in 2011-11-02 17:28:02.000000000 +0900 @@ -0,0 +1,43 @@ +--- ./apr-0.9.20/configure.in.orig 2008-06-20 17:32:47.000000000 +0000 ++++ ./apr-0.9.20/configure.in 2010-10-20 21:08:11.857624440 +0000 +@@ -7,6 +7,7 @@ + AC_INIT(build/apr_common.m4) + AC_CONFIG_HEADER(include/arch/unix/apr_private.h) + AC_CONFIG_AUX_DIR(build) ++AC_CONFIG_MACRO_DIR(build) + + dnl + dnl Include our own M4 macros along with those for libtool +@@ -16,6 +17,11 @@ + sinclude(build/apr_threads.m4) + sinclude(build/apr_hints.m4) + sinclude(build/libtool.m4) ++sinclude(build/ltsugar.m4) ++sinclude(build/argz.m4) ++sinclude(build/ltoptions.m4) ++sinclude(build/ltversion.m4) ++sinclude(build/lt~obsolete.m4) + + dnl Save user-defined environment settings for later restoration + dnl +@@ -98,6 +104,8 @@ + dnl preload section from invoking the macro to get compiler info. + AC_PROG_CC + ++AC_PROG_SED ++ + dnl Preload + APR_PRELOAD + +@@ -141,6 +149,11 @@ + AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental custom libtool (not included in source distribution)], + [experimental_libtool=$enableval],[experimental_libtool=no]) + ++dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL ++if test "x$Xsed" = "x"; then ++ Xsed="$SED -e 1s/^X//" ++fi ++ + case $host in + *os2*) + # Use a custom-made libtool replacement diff -ruN /usr/ports/devel/apr0/files/patch-apr-0.9.20__threadproc__unix__procsup.c devel/apr0/files/patch-apr-0.9.20__threadproc__unix__procsup.c --- /usr/ports/devel/apr0/files/patch-apr-0.9.20__threadproc__unix__procsup.c 1970-01-01 09:00:00.000000000 +0900 +++ devel/apr0/files/patch-apr-0.9.20__threadproc__unix__procsup.c 2011-11-02 17:32:56.000000000 +0900 @@ -0,0 +1,18 @@ +--- ./apr-0.9.20/threadproc/unix/procsup.c.orig 2006-09-20 16:04:09.000000000 +0000 ++++ ./apr-0.9.20/threadproc/unix/procsup.c 2010-10-20 21:08:11.859622744 +0000 +@@ -21,6 +21,7 @@ + int x; + + chdir("/"); ++#ifndef FREEBSD_THREAD_HACK + #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS) + /* Don't detach for MPE because child processes can't survive the death of + * the parent. */ +@@ -56,6 +57,7 @@ + return errno; + } + #endif ++#endif + + /* close out the standard file descriptors */ + if (freopen("/dev/null", "r", stdin) == NULL) { --- apr0.patch ends here --- From owner-freebsd-apache@FreeBSD.ORG Wed Nov 2 10:10:18 2011 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A577106564A; Wed, 2 Nov 2011 10:10:18 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 22D718FC12; Wed, 2 Nov 2011 10:10:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id pA2AAI0j054297; Wed, 2 Nov 2011 10:10:18 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id pA2AAHvW054290; Wed, 2 Nov 2011 10:10:17 GMT (envelope-from edwin) Date: Wed, 2 Nov 2011 10:10:17 GMT Message-Id: <201111021010.pA2AAHvW054290@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, apache@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/162247: [UPDATE] devel/apr0: Update 0.9.20 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2011 10:10:18 -0000 Synopsis: [UPDATE] devel/apr0: Update 0.9.20 Responsible-Changed-From-To: freebsd-ports-bugs->apache Responsible-Changed-By: edwin Responsible-Changed-When: Wed Nov 2 10:10:17 UTC 2011 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=162247 From owner-freebsd-apache@FreeBSD.ORG Wed Nov 2 10:56:07 2011 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AFA51065673; Wed, 2 Nov 2011 10:56:07 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 62EFB8FC14; Wed, 2 Nov 2011 10:56:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id pA2Au7c9000213; Wed, 2 Nov 2011 10:56:07 GMT (envelope-from linimon@freefall.freebsd.org) Received: (from linimon@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id pA2Au7JN000209; Wed, 2 Nov 2011 10:56:07 GMT (envelope-from linimon) Date: Wed, 2 Nov 2011 10:56:07 GMT Message-Id: <201111021056.pA2Au7JN000209@freefall.freebsd.org> To: takefu@airport.fm, linimon@FreeBSD.org, gnats-admin@FreeBSD.org, apache@FreeBSD.org From: linimon@FreeBSD.org Cc: Subject: Re: ports/162246: Re: [PATCH] www/apache20, www/apache22 Strip Binaries X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2011 10:56:07 -0000 Synopsis: Re: [PATCH] www/apache20,www/apache22 Strip Binaries State-Changed-From-To: open->closed State-Changed-By: linimon State-Changed-When: Wed Nov 2 10:55:32 UTC 2011 State-Changed-Why: Misfiled followup to ports/159812; content migrated. Responsible-Changed-From-To: gnats-admin->apache Responsible-Changed-By: linimon Responsible-Changed-When: Wed Nov 2 10:55:32 UTC 2011 Responsible-Changed-Why: http://www.freebsd.org/cgi/query-pr.cgi?pr=162246 From owner-freebsd-apache@FreeBSD.ORG Sat Nov 5 07:20:16 2011 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E83FD1065672; Sat, 5 Nov 2011 07:20:16 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C11208FC13; Sat, 5 Nov 2011 07:20:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id pA57KGBu092477; Sat, 5 Nov 2011 07:20:16 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id pA57KGwc092473; Sat, 5 Nov 2011 07:20:16 GMT (envelope-from edwin) Date: Sat, 5 Nov 2011 07:20:16 GMT Message-Id: <201111050720.pA57KGwc092473@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, apache@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/162305: [PATCH] www/mod_geoip2 update to 1.2.7 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2011 07:20:17 -0000 Synopsis: [PATCH] www/mod_geoip2 update to 1.2.7 Responsible-Changed-From-To: freebsd-ports-bugs->apache Responsible-Changed-By: edwin Responsible-Changed-When: Sat Nov 5 07:20:16 UTC 2011 Responsible-Changed-Why: apache@ wants this port PRs (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=162305 From owner-freebsd-apache@FreeBSD.ORG Sat Nov 5 07:20:21 2011 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03CC31065673; Sat, 5 Nov 2011 07:20:21 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D07768FC1B; Sat, 5 Nov 2011 07:20:20 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id pA57KKUS092791; Sat, 5 Nov 2011 07:20:20 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id pA57KKDj092783; Sat, 5 Nov 2011 07:20:20 GMT (envelope-from edwin) Date: Sat, 5 Nov 2011 07:20:20 GMT Message-Id: <201111050720.pA57KKDj092783@freefall.freebsd.org> To: john.marshall@riverwillow.com.au, edwin@FreeBSD.org, apache@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/162305: [PATCH] www/mod_geoip2 update to 1.2.7 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2011 07:20:21 -0000 Synopsis: [PATCH] www/mod_geoip2 update to 1.2.7 State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Sat Nov 5 07:20:20 UTC 2011 State-Changed-Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=162305 From owner-freebsd-apache@FreeBSD.ORG Sat Nov 5 07:30:18 2011 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47DF1106566B for ; Sat, 5 Nov 2011 07:30:18 +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 1EC4E8FC16 for ; Sat, 5 Nov 2011 07:30:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id pA57UHAg017450 for ; Sat, 5 Nov 2011 07:30:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id pA57UHET017449; Sat, 5 Nov 2011 07:30:17 GMT (envelope-from gnats) Date: Sat, 5 Nov 2011 07:30:17 GMT Message-Id: <201111050730.pA57UHET017449@freefall.freebsd.org> To: apache@FreeBSD.org From: Edwin Groothuis Cc: Subject: Re: ports/162305: [PATCH] www/mod_geoip2 update to 1.2.7 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2011 07:30:18 -0000 The following reply was made to PR ports/162305; it has been noted by GNATS. From: Edwin Groothuis To: jau@iki.fi Cc: bug-followup@FreeBSD.org Subject: Re: ports/162305: [PATCH] www/mod_geoip2 update to 1.2.7 Date: Sat, 5 Nov 2011 07:20:18 UT Maintainer of www/mod_geoip2, Please note that PR ports/162305 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/162305 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org