17 files changed, 118 insertions, 58 deletions
diff --git a/Configure b/Configure
index e5ce51144c..1e0c25463d 100755
--- a/Configure
+++ b/Configure
@@ -25,7 +25,7 @@
 
 # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $
 #
-# Generated on Fri Nov 28 08:39:51 CET 2008 [metaconfig 3.5 PL0]
+# Generated on Wed Dec  3 15:26:54 CET 2008 [metaconfig 3.5 PL0]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -361,6 +361,7 @@ d_aintl=''
 d_alarm=''
 asctime_r_proto=''
 d_asctime_r=''
+d_attribute_deprecated=''
 d_attribute_format=''
 d_attribute_malloc=''
 d_attribute_nonnull=''
@@ -10500,6 +10501,34 @@ set d_attribute_unused
 eval $setvar
 $rm -f attrib*
 
+: Look for GCC-style attribute deprecated
+case "$d_attribute_deprecated" in
+'')
+echo " "
+echo "Checking whether your compiler can handle __attribute__((deprecated)) ..." >&4
+$cat >attrib.c <<'EOCP'
+#include <stdio.h>
+int I_am_deprecated(void) __attribute__((deprecated));
+EOCP
+if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then
+	if $contains 'warning' attrib.out >/dev/null 2>&1; then
+		echo "Your C compiler doesn't support __attribute__((deprecated))."
+		val="$undef"
+	else
+		echo "Your C compiler supports __attribute__((deprecated))."
+		val="$define"
+	fi
+else
+	echo "Your C compiler doesn't seem to understand __attribute__ at all."
+	val="$undef"
+fi
+;;
+*) val="$d_attribute_deprecated" ;;
+esac
+set d_attribute_deprecated
+eval $setvar
+$rm -f attrib*
+
 : Look for GCC-style attribute warn_unused_result
 case "$d_attribute_warn_unused_result" in
 '')
@@ -22136,6 +22165,7 @@ d_asctime64='$d_asctime64'
 d_asctime_r='$d_asctime_r'
 d_atolf='$d_atolf'
 d_atoll='$d_atoll'
+d_attribute_deprecated='$d_attribute_deprecated'
 d_attribute_format='$d_attribute_format'
 d_attribute_malloc='$d_attribute_malloc'
 d_attribute_nonnull='$d_attribute_nonnull'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index d550263432..7c9ccce284 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -97,6 +97,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='define'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index 4907437177..2dc9f76235 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -99,6 +99,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/Porting/Glossary b/Porting/Glossary
index 27000735da..53a44c41c9 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -142,7 +142,7 @@ baserev (baserev.U):
 
 bash (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 bin (bin.U):
 	This variable holds the name of the directory in which the user wants
@@ -246,7 +246,7 @@ cf_time (cf_who.U):
 
 chgrp (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 chmod (Loc.U):
 	This variable is used internally by Configure to determine the
@@ -255,7 +255,7 @@ chmod (Loc.U):
 
 chown (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 clocktype (d_times.U):
 	This variable holds the type returned by times(). It can be long,
@@ -269,7 +269,7 @@ comm (Loc.U):
 
 compress (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 contains (contains.U):
 	This variable holds the command to do a grep with a proper return
@@ -284,7 +284,7 @@ cp (Loc.U):
 
 cpio (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 cpp (Loc.U):
 	This variable is used internally by Configure to determine the
@@ -406,6 +406,11 @@ d_atoll (atoll.U):
 	This variable conditionally defines the HAS_ATOLL symbol, which
 	indicates to the C program that the atoll() routine is available.
 
+d_attribute_deprecated (d_attribut.U):
+	This variable conditionally defines HASATTRIBUTE_DEPRECATED, which
+	indicates that GCC can handle the attribute for marking deprecated
+	APIs
+
 d_attribute_format (d_attribut.U):
 	This variable conditionally defines HASATTRIBUTE_FORMAT, which
 	indicates the C compiler can check for printf-like formats.
@@ -2507,7 +2512,7 @@ egrep (Loc.U):
 
 emacs (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 endgrent_r_proto (d_endgrent_r.U):
 	This variable encodes the prototype of endgrent_r.
@@ -2584,7 +2589,7 @@ fflushNULL (fflushall.U):
 
 find (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 firstmakefile (Unix.U):
 	This variable defines the first file searched by make.  On unix,
@@ -2594,7 +2599,7 @@ firstmakefile (Unix.U):
 
 flex (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 fpossize (fpossize.U):
 	This variable contains the size of a fpostype in bytes.
@@ -3300,7 +3305,7 @@ incpath (usrinc.U):
 
 inews (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 initialinstalllocation (bin.U):
 	When userelocatableinc is true, this variable holds the location
@@ -3514,7 +3519,7 @@ known_extensions (Extensions.U):
 
 ksh (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 ld (dlsrc.U):
 	This variable indicates the program to be used to link
@@ -3596,11 +3601,11 @@ libswanted_uselargefiles (uselfs.U):
 
 line (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 lint (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 lkflags (ccflags.U):
 	This variable contains any additional C partial linker flags desired by
@@ -3650,11 +3655,11 @@ longsize (intsize.U):
 
 lp (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 lpr (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 ls (Loc.U):
 	This variable is used internally by Configure to determine the
@@ -3689,11 +3694,11 @@ madlysrc (mad.U):
 
 mail (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 mailx (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 make (Loc.U):
 	This variable is used internally by Configure to determine the
@@ -3798,7 +3803,7 @@ multiarch (multiarch.U):
 
 mv (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 myarchname (archname.U):
 	This variable holds the architecture name computed by Configure in
@@ -3998,7 +4003,7 @@ path_sep (Unix.U):
 
 perl (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 perl5 (perl5.U):
 	This variable contains the full path (if any) to a previously
@@ -4097,11 +4102,11 @@ plibpth (libpth.U):
 
 pmake (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 pr (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 prefix (prefix.U):
 	This variable holds the name of the directory below which the
@@ -4203,7 +4208,7 @@ rm_try (Unix.U):
 
 rmail (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 run (Cross.U):
 	This variable contains the command used by Configure
@@ -4255,7 +4260,7 @@ selecttype (selecttype.U):
 
 sendmail (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 setgrent_r_proto (d_setgrent_r.U):
 	This variable encodes the prototype of setgrent_r.
@@ -4319,7 +4324,7 @@ sh (sh.U):
 
 shar (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 sharpbang (spitshell.U):
 	This variable contains the string #! if this system supports that
@@ -4533,7 +4538,7 @@ sizetype (sizetype.U):
 
 sleep (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 sLOCALTIME_max (time_size.U):
 	This variable defines the maximum value of the time_t offset that
@@ -4545,7 +4550,7 @@ sLOCALTIME_min (time_size.U):
 
 smail (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 so (so.U):
 	This variable holds the extension used to identify shared libraries
@@ -4724,7 +4729,7 @@ strings (i_string.U):
 
 submit (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 subversion (patchlevel.U):
 	The subversion level of this package.
@@ -4741,11 +4746,11 @@ sysman (sysman.U):
 
 tail (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 tar (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 targetarch (Cross.U):
 	If cross-compiling, this variable contains the target architecture.
@@ -4753,11 +4758,11 @@ targetarch (Cross.U):
 
 tbl (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 tee (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 test (Loc.U):
 	This variable is used internally by Configure to determine the
@@ -4802,7 +4807,7 @@ trnl (trnl.U):
 
 troff (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 ttyname_r_proto (d_ttyname_r.U):
 	This variable encodes the prototype of ttyname_r.
@@ -5017,7 +5022,7 @@ usrinc (usrinc.U):
 
 uuname (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 uvoformat (perlxvf.U):
 	This variable contains the format string used for printing
@@ -5189,7 +5194,7 @@ versiononly (versiononly.U):
 
 vi (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 voidflags (voidflags.U):
 	This variable contains the eventual value of the VOIDFLAGS symbol,
@@ -5211,7 +5216,7 @@ yaccflags (yacc.U):
 
 zcat (Loc.U):
 	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	The value is the empty string and is not useful.
 
 zip (Loc.U):
 	This variable is used internally by Configure to determine the
diff --git a/Porting/config.sh b/Porting/config.sh
index 276c8f1bd8..06f70bd358 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,9 +8,9 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Wed Jan 23 09:43:56 CET 2008
+# Configuration time: Wed Dec  3 15:15:56 CET 2008
 # Configured by     : merijn
-# Target system     : linux nb09 2.6.22.13-0.3-default #1 smp 20071119 15:02:58 utc i686 i686 i386 gnulinux 
+# Target system     : linux nb09 2.6.22.19-0.1-default #1 smp 2008-10-14 22:17:43 +0200 i686 i686 i386 gnulinux 
 
 : Configure command line arguments.
 config_arg0='./Configure'
@@ -124,6 +124,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='define'
+d_attribute_deprecated='define'
 d_attribute_format='define'
 d_attribute_malloc='define'
 d_attribute_nonnull='define'
@@ -137,7 +138,7 @@ d_bsd='undef'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
 d_builtin_choose_expr='define'
-d_builtin_expect='undef'
+d_builtin_expect='define'
 d_bzero='define'
 d_c99_variadic_macros='define'
 d_casti32='undef'
@@ -162,7 +163,7 @@ d_ctime64='undef'
 d_ctime_r='undef'
 d_cuserid='define'
 d_dbl_dig='define'
-d_dbminitproto='undef'
+d_dbminitproto='define'
 d_difftime64='undef'
 d_difftime='define'
 d_dir_dd_fd='undef'
@@ -347,7 +348,7 @@ d_msgsnd='define'
 d_msync='define'
 d_munmap='define'
 d_mymalloc='undef'
-d_ndbm='undef'
+d_ndbm='define'
 d_ndbm_h_uses_prototypes='undef'
 d_nice='define'
 d_nl_langinfo='define'
@@ -368,7 +369,7 @@ d_portable='define'
 d_printf_format_null='define'
 d_procselfexe='define'
 d_pseudofork='undef'
-d_pthread_atfork='define'
+d_pthread_atfork='undef'
 d_pthread_attr_setscope='define'
 d_pthread_yield='define'
 d_pwage='undef'
@@ -555,7 +556,7 @@ doublesize='8'
 drand01='drand48()'
 drand48_r_proto='0'
 dtrace=''
-dynamic_ext='attrs B Compress/Raw/Zlib Cwd Data/Dumper DB_File Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex threads Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap threads/shared Hash/Util/FieldHash'
+dynamic_ext='attrs B Compress/Raw/Zlib Cwd Data/Dumper DB_File Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex threads Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap threads/shared Hash/Util/FieldHash'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -570,7 +571,8 @@ endservent_r_proto='0'
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='attrs B Compress/Raw/Zlib Cwd Data/Dumper DB_File Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex threads Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+extensions='attrs B Compress/Raw/Zlib Cwd Data/Dumper DB_File Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex threads Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap threads/shared Hash/Util/FieldHash Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib Module/Pluggable Test/Harness'
+extern_C='extern'
 extras=''
 fflushNULL='define'
 fflushall='undef'
@@ -640,7 +642,7 @@ i_assert='define'
 i_bsdioctl=''
 i_crypt='define'
 i_db='define'
-i_dbm='undef'
+i_dbm='define'
 i_dirent='define'
 i_dld='undef'
 i_dlfcn='define'
@@ -664,7 +666,7 @@ i_mallocmalloc='undef'
 i_math='define'
 i_memory='undef'
 i_mntent='define'
-i_ndbm='undef'
+i_ndbm='define'
 i_netdb='define'
 i_neterrno='undef'
 i_netinettcp='define'
@@ -764,8 +766,8 @@ ivtype='long long'
 known_extensions='attrs B Compress/Raw/Zlib Cwd Data/Dumper DB_File Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex threads Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap threads/shared Hash/Util/FieldHash'
 ksh=''
 ld='cc'
-lddlflags='-shared -O2 -L/usr/local/lib'
-ldflags=' -fstack-protector -L/usr/local/lib'
+lddlflags='-shared -O2 -L/usr/local/lib -fstack-protector'
+ldflags='-L/usr/local/lib -fstack-protector'
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
@@ -773,12 +775,12 @@ lib_ext='.a'
 libc='/lib/libc-2.7.so'
 libperl='libperl.a'
 libpth='/usr/local/lib /lib /usr/lib'
-libs='-lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc'
+libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat'
 libsdirs=' /usr/lib'
-libsfiles=' libpthread.so libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so'
-libsfound=' /usr/lib/libpthread.so /usr/lib/libnsl.so /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
+libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so'
+libsfound=' /usr/lib/libnsl.so /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so /usr/lib/libgdbm_compat.so'
 libspath=' /usr/local/lib /lib /usr/lib'
-libswanted='cl pthread sfio socket inet nsl nm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted='sfio socket inet nsl nm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
 libswanted_uselargefiles=''
 line=''
 lint=''
@@ -824,7 +826,7 @@ mv=''
 myarchname='i686-linux'
 mydomain='.yourplace.com'
 myhostname='yourhost'
-myuname='linux nb09 2.6.22.13-0.3-default #1 smp 20071119 15:02:58 utc i686 i686 i386 gnulinux '
+myuname='linux nb09 2.6.22.19-0.1-default #1 smp 2008-10-14 22:17:43 +0200 i686 i686 i386 gnulinux '
 n='-n'
 need_va_copy='undef'
 netdb_hlen_type='size_t'
@@ -834,7 +836,7 @@ netdb_net_type='in_addr_t'
 nm='nm'
 nm_opt=''
 nm_so_opt='--dynamic'
-nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib'
+nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib Module/Pluggable Test/Harness'
 nroff='nroff'
 nvEUformat='"E"'
 nvFUformat='"F"'
@@ -852,18 +854,18 @@ old_pthread_create_joinable=''
 optimize='-O2'
 orderlib='false'
 osname='linux'
-osvers='2.6.22.18-0.2-default'
+osvers='2.6.22.19-0.1-default'
 otherlibdirs=' '
 package='perl5'
-pager='/pro/local/bin/less'
+pager='/usr/bin/less'
 passcat='cat /etc/passwd'
 patchlevel='11'
 path_sep=':'
 perl5='/opt/perl/bin/perl'
 perl=''
-perl_patchlevel='34454'
+perl_patchlevel='34948'
 perladmin='yourname@yourhost.yourplace.com'
-perllibs='-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
 perlpath='/opt/perl/bin/perl5.11.0'
 pg='pg'
 phostname=''
@@ -1023,6 +1025,7 @@ use5005threads='undef'
 use64bitall='undef'
 use64bitint='define'
 usecrosscompile='undef'
+usedevel='define'
 usedl='define'
 usedtrace='undef'
 usefaststdio='undef'
@@ -1102,7 +1105,7 @@ PERL_SUBVERSION=0
 PERL_API_REVISION=5
 PERL_API_VERSION=11
 PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=34454
+PERL_PATCHLEVEL=34948
 PERL_CONFIG_SH=true
 : Variables propagated from previous config.sh file.
 libdb_needs_pthread='N'
diff --git a/config_h.SH b/config_h.SH
index 7706b72a6a..55292c9e78 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -1106,9 +1106,13 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 /* HASATTRIBUTE_UNUSED:
  *	Can we handle GCC attribute for unused variables and arguments
  */
+/* HASATTRIBUTE_DEPRECATED:
+ *	Can we handle GCC attribute for marking deprecated APIs
+ */
 /* HASATTRIBUTE_WARN_UNUSED_RESULT:
  *	Can we handle GCC attribute for warning on unused results
  */
+#$d_attribute_deprecated HASATTRIBUTE_DEPRECATED	/**/
 #$d_attribute_format HASATTRIBUTE_FORMAT	/**/
 #$d_printf_format_null PRINTF_FORMAT_NULL_OK	/**/
 #$d_attribute_noreturn HASATTRIBUTE_NORETURN	/**/
diff --git a/configure.com b/configure.com
index 6231a829dd..d1dab4d225 100644
--- a/configure.com
+++ b/configure.com
@@ -5820,6 +5820,7 @@ $ WC "d_asctime64='undef'"
 $ WC "d_atolf='" + d_atolf + "'"
 $ WC "d_atoll='" + d_atoll + "'"
 $ WC "d_attribute_format='" + d_attribut + "'"
+$ WC "d_attribute_deprecated='undef'"
 $ WC "d_attribute_malloc='undef'"
 $ WC "d_attribute_nonnull='undef'"
 $ WC "d_attribute_noreturn='undef'"
diff --git a/epoc/config.sh b/epoc/config.sh
index 601ab45193..49f59147dc 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -104,6 +104,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/perl.h b/perl.h
index e9c361160d..de4021c664 100644
--- a/perl.h
+++ b/perl.h
@@ -3150,6 +3150,9 @@ typedef pthread_key_t	perl_key;
 #  endif
 #endif
 
+#ifdef HASATTRIBUTE_DEPRECATED
+#  define __attribute__deprecated__         __attribute__((deprecated))
+#endif
 #ifdef HASATTRIBUTE_FORMAT
 #  define __attribute__format__(x,y,z)      __attribute__((format(x,y,z)))
 #endif
@@ -3173,6 +3176,9 @@ typedef pthread_key_t	perl_key;
 #endif
 
 /* If we haven't defined the attributes yet, define them to blank. */
+#ifndef __attribute__deprecated__
+#  define __attribute__deprecated__
+#endif
 #ifndef __attribute__format__
 #  define __attribute__format__(x,y,z)
 #endif
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index d2b6544fd3..69db0ebe76 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -111,6 +111,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='define'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/symbian/config.sh b/symbian/config.sh
index 8b2cd4aaab..1a6d2404ed 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -54,6 +54,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/uconfig.sh b/uconfig.sh
index c0a749e404..b3e7278f04 100755
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -48,6 +48,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/win32/config.bc b/win32/config.bc
index 5bded78b16..520bac39b5 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -99,6 +99,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/win32/config.ce b/win32/config.ce
index 8e3396892e..70e9acd479 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -99,6 +99,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 5c39929f01..c295356c3c 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -99,6 +99,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 5990a1cd27..3b057465f5 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -99,6 +99,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'
diff --git a/win32/config.vc64 b/win32/config.vc64
index 4a864eac23..af61178ba2 100644
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -99,6 +99,7 @@ d_asctime64='undef'
 d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='define'
+d_attribute_deprecated='undef'
 d_attribute_format='undef'
 d_attribute_malloc='undef'
 d_attribute_nonnull='undef'