Sun Oct 4 14:03:38 2015 UTC ()
Pullup ticket #4832 - requested by taca
lang/php56: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.114
- lang/php56/distinfo                                           1.16
- lang/php56/patches/patch-aclocal.m4                           deleted
- lang/php56/patches/patch-build_libtool.m4                     deleted
- lang/php56/patches/patch-configure                            1.2

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct  2 14:37:40 UTC 2015

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php56: distinfo
   	pkgsrc/lang/php56/patches: patch-configure
   Removed Files:
   	pkgsrc/lang/php56/patches: patch-aclocal.m4 patch-build_libtool.m4

   Log Message:
   Update php56 to 5.6.14.

   01 Oct 2015, PHP 5.6.14

   - Core:
     . Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when
       building extensions). (Adam)

   - CLI server:
     . Fixed bug #68291 (404 on urls with '+'). (cmb)

   - DOM:
     . Fixed bug #70001 (Assigning to DOMNode::textContent does additional entity
       encoding). (cmb)

   - Mysqlnd:
     . Fixed bug #70456 (mysqlnd doesn't activate TCP keep-alive when connecting to
       a server). (Sergei Turchanov)

   - OpenSSL:
     . Fixed bug #55259 (openssl extension does not get the DH parameters from
       DH key resource). (Jakub Zelenka)
     . Fixed bug #70395 (Missing ARG_INFO for openssl_seal()). (cmb)
     . Fixed bug #60632 (openssl_seal fails with AES). (Jakub Zelenka)
     . Fixed bug #68312 (Lookup for openssl.cnf causes a message box). (Anatol)

   - PDO:
     . Fixed bug #70389 (PDO constructor changes unrelated variables). (Laruence)

   - Phar:
     . Fixed bug #69720 (Null pointer dereference in phar_get_fp_offset()). (Stas)
     . FIxed bug #70433 (Uninitialized pointer in phar_make_dirstream when zip
       entry filename is "/"). (Stas)

   - Phpdbg:
     . Fix phpdbg_break_next() sometimes not breaking. (Bob)

   - Standard:
     . Fixed bug #67131 (setcookie() conditional for empty values not met). (cmb)

   - Streams:
     . Fixed bug #70361 (HTTP stream wrapper doesn't close keep-alive connections).
       (Niklas Keller)

   - Zip:
     . Fixed bug #70322 (ZipArchive::close() doesn't indicate errors). (cmb)


(bsiegert)
diff -r1.111.2.1 -r1.111.2.2 pkgsrc/lang/php/phpversion.mk
diff -r1.15 -r1.15.2.1 pkgsrc/lang/php56/distinfo
diff -r1.1 -r0 pkgsrc/lang/php56/patches/patch-aclocal.m4
diff -r1.1 -r0 pkgsrc/lang/php56/patches/patch-build_libtool.m4
diff -r1.1 -r1.1.8.1 pkgsrc/lang/php56/patches/patch-configure
cvs diff -r1.111.2.1 -r1.111.2.2 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2015/10/04 13:53:12 1.111.2.1
+++ pkgsrc/lang/php/phpversion.mk 2015/10/04 14:03:38 1.111.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.111.2.1 2015/10/04 13:53:12 bsiegert Exp $ 1# $NetBSD: phpversion.mk,v 1.111.2.2 2015/10/04 14:03:38 bsiegert Exp $
2# 2#
3# This file selects a PHP version, based on the user's preferences and 3# This file selects a PHP version, based on the user's preferences and
4# the installed packages. It does not add a dependency on the PHP 4# the installed packages. It does not add a dependency on the PHP
5# package. 5# package.
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# PHP_VERSION_DEFAULT 9# PHP_VERSION_DEFAULT
10# The PHP version to choose when more than one is acceptable to 10# The PHP version to choose when more than one is acceptable to
11# the package. 11# the package.
12# 12#
13# Possible: 54 55 56 13# Possible: 54 55 56
14# Default: 54 14# Default: 54
@@ -73,27 +73,27 @@ @@ -73,27 +73,27 @@
73# initial release of major version. 73# initial release of major version.
74# 74#
75# Example: lib/php/20090630 75# Example: lib/php/20090630
76# 76#
77# Keywords: php 77# Keywords: php
78# 78#
79 79
80.if !defined(PHPVERSION_MK) 80.if !defined(PHPVERSION_MK)
81PHPVERSION_MK= defined 81PHPVERSION_MK= defined
82 82
83# Define each PHP's version. 83# Define each PHP's version.
84PHP54_VERSION= 5.4.45 84PHP54_VERSION= 5.4.45
85PHP55_VERSION= 5.5.30 85PHP55_VERSION= 5.5.30
86PHP56_VERSION= 5.6.13 86PHP56_VERSION= 5.6.14
87 87
88# Define initial release of major version. 88# Define initial release of major version.
89PHP54_RELDATE= 20120301 89PHP54_RELDATE= 20120301
90PHP55_RELDATE= 20130620 90PHP55_RELDATE= 20130620
91PHP56_RELDATE= 20140828 91PHP56_RELDATE= 20140828
92 92
93_VARGROUPS+= php 93_VARGROUPS+= php
94_USER_VARS.php= PHP_VERSION_DEFAULT 94_USER_VARS.php= PHP_VERSION_DEFAULT
95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
97 PKG_PHP_MAJOR_VERS 97 PKG_PHP_MAJOR_VERS
98 98
99.include "../../mk/bsd.prefs.mk" 99.include "../../mk/bsd.prefs.mk"
cvs diff -r1.15 -r1.15.2.1 pkgsrc/lang/php56/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php56/distinfo 2015/09/06 12:27:43 1.15
+++ pkgsrc/lang/php56/distinfo 2015/10/04 14:03:38 1.15.2.1
@@ -1,22 +1,20 @@ @@ -1,22 +1,20 @@
1$NetBSD: distinfo,v 1.15 2015/09/06 12:27:43 taca Exp $ 1$NetBSD: distinfo,v 1.15.2.1 2015/10/04 14:03:38 bsiegert Exp $
2 2
3SHA1 (php-5.6.13.tar.bz2) = 0fc2f582a6670efc512dc872da6638796ed64525 3SHA1 (php-5.6.14.tar.bz2) = 21706059790fb48db7e7105bf1734d7e677aa7cd
4RMD160 (php-5.6.13.tar.bz2) = a7f243e72b185f6da2a859bb80a59790c2c2aaba 4RMD160 (php-5.6.14.tar.bz2) = cb3c8a389d3b2d9c4a1ee88e6b5568de9182a347
5Size (php-5.6.13.tar.bz2) = 14077633 bytes 5Size (php-5.6.14.tar.bz2) = 14073920 bytes
6SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8 6SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
7SHA1 (patch-aclocal.m4) = 49117c42e03bd3ed57d967d33ba543f936013b4f 7SHA1 (patch-configure) = a72aa43759c6f3d3ad350659397570582c3ca3ff
8SHA1 (patch-build_libtool.m4) = f459cda09cbdad9780568d271091fb17bbc5d965 
9SHA1 (patch-configure) = d3d44c814deb0264fd4fc41908c2ff31fde00b0d 
10SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd 8SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd
11SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 9SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
12SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c 10SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
13SHA1 (patch-ext_opcache_config.m4) = 031db201f68a120615561a5abd3e84aff58b523d 11SHA1 (patch-ext_opcache_config.m4) = 031db201f68a120615561a5abd3e84aff58b523d
14SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 12SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
15SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 13SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
16SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 14SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
17SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 15SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f 16SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
19SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 17SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
20SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419 18SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
21SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f 19SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
22SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d 20SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d
File Deleted: pkgsrc/lang/php56/patches/Attic/patch-aclocal.m4
File Deleted: pkgsrc/lang/php56/patches/Attic/patch-build_libtool.m4
cvs diff -r1.1 -r1.1.8.1 pkgsrc/lang/php56/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/php56/patches/patch-configure 2014/11/24 15:37:08 1.1
+++ pkgsrc/lang/php56/patches/patch-configure 2015/10/04 14:03:38 1.1.8.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $ 1$NetBSD: patch-configure,v 1.1.8.1 2015/10/04 14:03:38 bsiegert Exp $
2 2
3--- configure.orig 2014-11-13 10:07:25.000000000 +0000 3--- configure.orig 2015-09-30 07:18:32.000000000 +0000
4+++ configure 4+++ configure
5@@ -8310,27 +8310,6 @@ EOF 5@@ -8315,27 +8315,6 @@ EOF
6 ;; 6 ;;
7 esac 7 esac
8  8
9- if test "$APACHE_VERSION" -lt 2004001; then 9- if test "$APACHE_VERSION" -lt 2004001; then
10- APXS_MPM=`$APXS -q MPM_NAME` 10- APXS_MPM=`$APXS -q MPM_NAME`
11- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then 11- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
12- 12-
13- enable_maintainer_zts=yes 13- enable_maintainer_zts=yes
14- if test "$pthreads_working" != "yes"; then 14- if test "$pthreads_working" != "yes"; then
15- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 15- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
16- fi 16- fi
17- 17-
18- fi 18- fi
@@ -20,27 +20,27 @@ $NetBSD: patch-configure,v 1.1 2014/11/2 @@ -20,27 +20,27 @@ $NetBSD: patch-configure,v 1.1 2014/11/2
20- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` 20- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
21- if test -n "$APACHE_THREADED_MPM"; then 21- if test -n "$APACHE_THREADED_MPM"; then
22- 22-
23- enable_maintainer_zts=yes 23- enable_maintainer_zts=yes
24- if test "$pthreads_working" != "yes"; then 24- if test "$pthreads_working" != "yes"; then
25- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 25- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
26- fi 26- fi
27- 27-
28- fi 28- fi
29- fi 29- fi
30 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 30 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
31 $as_echo "yes" >&6; } 31 $as_echo "yes" >&6; }
32  32
33@@ -9134,27 +9113,6 @@ EOF 33@@ -9139,27 +9118,6 @@ EOF
34 ;; 34 ;;
35 esac 35 esac
36  36
37- if test "$APACHE_VERSION" -lt 2004001; then 37- if test "$APACHE_VERSION" -lt 2004001; then
38- APXS_MPM=`$APXS -q MPM_NAME` 38- APXS_MPM=`$APXS -q MPM_NAME`
39- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then 39- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
40- 40-
41- enable_maintainer_zts=yes 41- enable_maintainer_zts=yes
42- if test "$pthreads_working" != "yes"; then 42- if test "$pthreads_working" != "yes"; then
43- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 43- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
44- fi 44- fi
45- 45-
46- fi 46- fi
@@ -48,99 +48,72 @@ $NetBSD: patch-configure,v 1.1 2014/11/2 @@ -48,99 +48,72 @@ $NetBSD: patch-configure,v 1.1 2014/11/2
48- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` 48- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
49- if test -n "$APACHE_THREADED_MPM"; then 49- if test -n "$APACHE_THREADED_MPM"; then
50- 50-
51- enable_maintainer_zts=yes 51- enable_maintainer_zts=yes
52- if test "$pthreads_working" != "yes"; then 52- if test "$pthreads_working" != "yes"; then
53- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 53- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
54- fi 54- fi
55- 55-
56- fi 56- fi
57- fi 57- fi
58 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 58 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
59 $as_echo "yes" >&6; } 59 $as_echo "yes" >&6; }
60  60
61@@ -24596,7 +24554,7 @@ fi 61@@ -24712,7 +24670,7 @@ fi
62 if test "$found_openssl" = "no"; then 62 if test "$found_openssl" = "no"; then
63  63
64 if test "$PHP_OPENSSL_DIR" = "yes"; then 64 if test "$PHP_OPENSSL_DIR" = "yes"; then
65- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 65- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
66+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 66+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
67 fi 67 fi
68  68
69 for i in $PHP_OPENSSL_DIR; do 69 for i in $PHP_OPENSSL_DIR; do
70@@ -26751,7 +26709,7 @@ $as_echo "yes" >&6; } 70@@ -26868,7 +26826,7 @@ $as_echo "yes" >&6; }
71 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" 71 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
72  72
73  73
74- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do 74- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
75+ for header_file; do 75+ for header_file; do
76  76
77  77
78 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 78 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
79@@ -37864,7 +37822,7 @@ fi 79@@ -37981,7 +37939,7 @@ fi
80 if test "$found_openssl" = "no"; then 80 if test "$found_openssl" = "no"; then
81  81
82 if test "$PHP_OPENSSL_DIR" = "yes"; then 82 if test "$PHP_OPENSSL_DIR" = "yes"; then
83- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 83- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
84+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 84+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
85 fi 85 fi
86  86
87 for i in $PHP_OPENSSL_DIR; do 87 for i in $PHP_OPENSSL_DIR; do
88@@ -49266,7 +49224,7 @@ fi 88@@ -49593,7 +49551,7 @@ fi
89 if test "$found_openssl" = "no"; then 89 if test "$found_openssl" = "no"; then
90  90
91 if test "$PHP_OPENSSL_DIR" = "yes"; then 91 if test "$PHP_OPENSSL_DIR" = "yes"; then
92- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 92- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
93+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" 93+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
94 fi 94 fi
95  95
96 for i in $PHP_OPENSSL_DIR; do 96 for i in $PHP_OPENSSL_DIR; do
97@@ -66188,7 +66146,7 @@ rm -f core *.core core.conftest.* gmon.o 97@@ -66618,7 +66576,7 @@ rm -f core *.core core.conftest.* gmon.o
98 fi 98 fi
99  99
100  100
101-if test "$flock_type" == "unknown"; then 101-if test "$flock_type" == "unknown"; then
102+if test "$flock_type" = "unknown"; then 102+if test "$flock_type" = "unknown"; then
103 as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5 103 as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
104 fi 104 fi
105  105
106@@ -106720,12 +106678,7 @@ old_CC=$CC 106@@ -107099,12 +107057,7 @@ old_CC=$CC
107 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then 107 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
108 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" 108 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
109 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" 109 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
110- cat >meta_ccld<<EOF 110- cat >meta_ccld<<EOF
111-#! /bin/sh 111-#! /bin/sh
112-exec $CC $ac_cv_pthreads_cflags \$@ 112-exec $CC $ac_cv_pthreads_cflags \$@
113-EOF 113-EOF
114- CC="$abs_builddir/meta_ccld" 114- CC="$abs_builddir/meta_ccld"
115- chmod +x meta_ccld 115- chmod +x meta_ccld
116+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" 116+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
117 fi 117 fi
118  118
119 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then 119 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
120@@ -110497,7 +110450,7 @@ freebsd* | dragonfly*) 
121 objformat=`/usr/bin/objformat` 
122 else 
123 case $host_os in 
124- freebsd[123]*) objformat=aout ;; 
125+ freebsd[123]|freebsd[123].*) objformat=aout ;; 
126 *) objformat=elf ;; 
127 esac 
128 fi 
129@@ -112577,7 +112530,7 @@ if test -z "$aix_libpath"; then aix_libp 
130 ;; 
131 esac 
132 ;; 
133- freebsd[12]*) 
134+ freebsd[12]|freebsd[12].*) 
135 # C++ shared libraries reported to be fairly broken before switch to ELF 
136 ld_shlibs_CXX=no 
137 ;; 
138@@ -114130,7 +114083,7 @@ freebsd* | dragonfly*) 
139 objformat=`/usr/bin/objformat` 
140 else 
141 case $host_os in 
142- freebsd[123]*) objformat=aout ;; 
143+ freebsd[123]|freebsd[123].*) objformat=aout ;; 
144 *) objformat=elf ;; 
145 esac 
146 fi