Hello community,
here is the log from the commit of package erlang for openSUSE:Factory checked
in at 2012-11-18 20:25:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/erlang (Old)
and /work/SRC/openSUSE:Factory/.erlang.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang", Maintainer is "cth...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2012-10-13
19:55:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2012-11-18
20:25:35.000000000 +0100
@@ -2 +2 @@
-Thu Oct 11 11:34:36 UTC 2012 - sasc...@suse.de
+Fri Nov 16 22:51:00 MSK 2012 - matwey.korni...@gmail.com
@@ -4 +4,21 @@
-- Install man-pages into /usr/share/man, not a erlang-private directory
+- directory /usr/share/man/man1 is handled by filesystem package,
+ we don't have to package it twice
+
+-------------------------------------------------------------------
+Fri Nov 9 11:54:55 UTC 2012 - sasc...@suse.de
+
+- Symlink man-pages for binaries (1) into %_mandir (bnc#788027)
+
+-------------------------------------------------------------------
+Tue Nov 6 14:00:09 UTC 2012 - sasc...@suse.de
+
+- Use SPDX-style license (ErlPL-1.1)
+- Merge changes from devel:languages:misc/erlang, which is still the
+ devel project for Factory.
+
+-------------------------------------------------------------------
+Wed Oct 31 14:55:39 UTC 2012 - sasc...@suse.de
+
+- Set same permissions for the following files (bnc#784670):
+ /usr/lib64/erlang/bin/start_erl
+ /usr/lib64/erlang/erts-5.8.5/bin/start_erl.src
@@ -16 +36 @@
-Wed Jul 25 14:05:47 UTC 2012 - dval...@suse.com
+Thu Sep 27 01:16:22 UTC 2012 - mrueck...@suse.de
@@ -18 +38,5 @@
-- Add erlang-ppc.patch: Fix PPC architecture detection
+- epmd should not run under the service that needs it first:
+ - add init script to launch epmd under the newly added epmd
+ user/group.
+ - added /etc/sysconfig/erlang to configure the port and the
+ listening IP
@@ -21 +45 @@
-Fri Jun 29 09:54:00 UTC 2012 - idon...@suse.com
+Mon Sep 10 09:26:31 UTC 2012 - kru...@zib.de
@@ -23,2 +47,28 @@
-- Fix build with OpenDJK7, -target parameter no longer sets
- -source so we have to do it manually.
+- require generic java-devel package for all distros (>= 1.5.0)
+- fixed javac define for openjdk7
+- enabled parallel build again
+
+-------------------------------------------------------------------
+Thu Sep 6 09:00:14 UTC 2012 - kru...@zib.de
+
+- update to R15B02 release:
+ + Highlights:
+ * Dialyzer: The type analysis tool Dialyzer is optimized to be
+ generally faster. - It can now also run in parallel (default)
+ on SMP systems and by this perform the analysis significantly
+ faster (Thanks to Stavros Aronis and Kostis Sagonas)
+ * The SSL application now has experimental support for the
+ TLS 1.1 and 1.2 standards as well (Thanks to Andreas Schultz).
+ * CommonTest: It is now possible to sort the generated html
+ tables. A Netconf client (ct_netconf) which support basic
+ netconf over ssh is added
+ * Diameter: Statistics counters related to Diameter messages can
+ now be retrieved by calling the diameter:service_info/2 function.
+ * Various smaller optimizations in the Erlang VM
+ * This release also contains 66 contributions from users outside
+ the Ericsson team
+
+-------------------------------------------------------------------
+Wed Jul 25 14:05:47 UTC 2012 - dval...@suse.com
+
+- Add erlang-ppc.patch: Fix PPC architecture detection
@@ -32,0 +83,44 @@
+Mon Apr 16 16:15:13 UTC 2012 - kru...@zib.de
+
+- updated to R15B01 release:
+ + Highlights from R15B01:
+ * Added erlang:statistics(scheduler_wall_time) to ensure correct
+ determination of scheduler utilization. Measuring scheduler
+ utilization is strongly preferred over CPU utilization, since
+ CPU utilization gives very poor indications of actual
+ scheduler/vm usage.
+ * Changed ssh implementation to use the public_key application
+ for all public key handling. This is also a first step for
+ enabling a callback API for supplying public keys and handling
+ keys protected with password phrases. Additionally the test
+ suites where improved so that they do not copy the users keys
+ to test server directories as this is a security liability.
+ Also ipv6 and file access issues found in the process has been
+ fixed.
+ * When an escript ends now all printout to standard output and
+ standard error gets out on the terminal. This bug has been
+ corrected by changing the behaviour of erlang:halt/0,1, which
+ should fix the same problem for other escript-like applications,
+ i.e. that data stored in the output port driver buffers got
+ lost when printing on a TTY and exiting through erlang:halt/0,1.
+ The BIF:s erlang:halt/0,1 has gotten improved semantics and
+ there is a new BIF erlang:halt/2 to accomplish something like
+ the old semantics. See the documentation.
+ * The DTrace source patch from Scott Lystig Fritchie is
+ integrated in the source tree. Using an emulator with dtrace
+ probe is still not supported for production use, but may be a
+ valuable debugging tool. Configure with
+ --with-dynamic-trace=dtrace (or --with-dynamic-trace=systemtap)
+ to create a build with dtrace probes enabled. See runtime_tools
+ for documentation and examples
+ * Added Torbjörn Törnkvists LDAP client as a new application
+ called eldap.
+ * Added options for the ssh client to support user keys files
+ that are password protected.
+
+-------------------------------------------------------------------
+Thu Dec 14 22:07:03 UTC 2011 - a...@simonov.me
+
+- updated to R15B release
+
+-------------------------------------------------------------------
@@ -35 +129 @@
-- Drop files with propriatery license (diameter and xmerl), see bnc#728667
+- Drop files with propriatery license (diameter and xmerl) (bnc#728667)
Old:
----
otp-R13B04-sslrpath.patch
otp-R14B-implfun.patch
otp-R14B04-rpath.patch
otp_doc_html_R14B04.tar.gz
otp_doc_man_R14B04.tar.gz
otp_src_R14B04.tar.gz
New:
----
epmd.init
erlang.sysconfig
otp-R15B02-rpath.patch
otp_doc_html_R15B02.tar.gz
otp_doc_man_R15B02.tar.gz
otp_src_R15B02.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ erlang.spec ++++++
--- /var/tmp/diff_new_pack.3Fj5zN/_old 2012-11-18 20:25:44.000000000 +0100
+++ /var/tmp/diff_new_pack.3Fj5zN/_new 2012-11-18 20:25:44.000000000 +0100
@@ -17,7 +17,7 @@
Name: erlang
-Version: R14B04
+Version: R15B02
Release: 0
Summary: General-purpose programming language and runtime environment
License: ErlPL-1.1
@@ -30,13 +30,12 @@
Source2: otp_doc_man_%{version}.tar.gz
#Source2: http://www.erlang.org/download/otp_doc_man_%{version}.tar.gz
Source3: %{name}-rpmlintrc
+Source4: epmd.init
+Source5: erlang.sysconfig
# PATCH-MISSING-TAG -- See
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch0: otp-R14B04-rpath.patch
+Patch0: otp-R15B02-rpath.patch
# PATCH-MISSING-TAG -- See
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch1: otp-R13B04-sslrpath.patch
-# PATCH-MISSING-TAG -- See
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch2: otp-R14B-implfun.patch
-Patch3: erlang-ppc.patch
+Patch1: erlang-ppc.patch
BuildRequires: gcc-c++
BuildRequires: ncurses-devel
BuildRequires: openssh
@@ -64,6 +63,8 @@
BuildRequires: wxGTK-devel >= 2.8
%endif
+%define epmd_home %{_var}/lib/epmd
+
%description
Erlang is a general-purpose programming language and runtime
environment. Erlang has built-in support for concurrency, distribution
@@ -93,7 +94,7 @@
%package doc
Summary: Erlang documentation
Group: Development/Languages/Other
-Requires: %{name} = %{version}
+Recommends: %{name} = %{version}
%description doc
Documentation for Erlang.
@@ -185,9 +186,7 @@
%prep
%setup -q -n otp_src_%{version}
%patch0 -p1 -b .rpath
-%patch1 -p1 -b .sslrpath
-%patch2 -p1 -b .implfun
-%patch3 -p1
+%patch1 -p1
chmod -R u+w .
# enable dynamic linking for ssl
@@ -198,10 +197,6 @@
# fix for arch linux bug #17001 (wx not working)
sed -i 's|WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`|WX_LIBS="`$WX_CONFIG_WITH_ARGS
--libs` -lGLU"|' lib/wx/configure || return 1
-mkdir -p erlang_doc erlang_man
-tar -C erlang_doc -xzf %{SOURCE1}
-tar -C erlang_man -xzf %{SOURCE2}
-
%build
# we need build only 1.5 target for java
# for SLE only
@@ -222,12 +217,8 @@
--enable-kernel-poll \
--enable-hipe \
--enable-shared-zlib
-make
-# parallel builds do not work (yet) - last tested with R14B04
-# make %{?_smp_mflags}
-
-# compress man pages ...
-find erlang_man/man* -type f -exec gzip {} +
+# should work up to at least -j8
+make %{?_smp_mflags}
%install
%if 0%{?sles_version} >= 10
@@ -246,6 +237,14 @@
rm %{buildroot}%{_libdir}/erlang/lib/tools-$TOOLS_VERSION/emacs/test.erl.orig
mv
%{buildroot}%{_libdir}/erlang/lib/tools-$TOOLS_VERSION/emacs/test.erl.indented
%{buildroot}%{_libdir}/erlang/lib/tools-$TOOLS_VERSION/emacs/test.erl
+# doc
+mv README.md README
+mkdir -p erlang_doc
+tar -C erlang_doc -xzf %{SOURCE1}
+tar -C %{buildroot}/%{_libdir}/erlang -xzf %{SOURCE2}
+# compress man pages ...
+find %{buildroot}%{_libdir}/erlang/man -type f -exec gzip {} +
+
#make link to OtpErlang-*.jar in %%{_javadir}
mkdir -p %{buildroot}%{_javadir}
cd %{buildroot}%{_javadir}
@@ -255,13 +254,14 @@
# Remove binary and source files with propriatery license, see bnc#728667
rm -r %{buildroot}%{_libdir}/erlang/lib/diameter-*
-rm -r erlang_man/man/man?/diameter* # Doesn't make much sense w/o the above
+rm -r %{buildroot}%{_libdir}/erlang/man/man?/diameter* # Doesn't make much
sense w/o the above
rm -r lib/diameter lib/xmerl/test/xmerl_xsd_SUITE_data # Can't distribute
either source
-# doc
-mv README.md README
-install -d %{buildroot}%{_mandir}
-cp -r erlang_man/man/man? %{buildroot}%{_mandir}
+# The man-pages for binaries are safe to move to %{_mandir}, others may
conflict with other packages
+mkdir -p %{buildroot}%{_mandir}/man1
+for link in $(ls %{buildroot}%{_libdir}/erlang/man/man1/); do
+ ln -s %{_libdir}/erlang/man/man1/$link %{buildroot}%{_mandir}/man1/$link
+done
# emacs: automatically load support for erlang
# http://lists.mandriva.com//bugs/2007-08/msg00930.php
@@ -274,17 +274,37 @@
%if 0%{?suse_version} > 1020
# hardlink duplicates:
+find . -name "start_erl*" | xargs chmod 755
%fdupes %{buildroot}/%{_libdir}/erlang
# %%doc macro copies the files to the package doc dir, hardlinks thus don't
work
%fdupes -s erlang_doc
%endif
+install -d -m 0750 %{buildroot}%{epmd_home}
+install -D -m 0755 %{S:4} %{buildroot}/etc/init.d/epmd
+install -D -m 0644 %{S:5}
%{buildroot}/var/adm/fillup-templates/sysconfig.erlang
+
+%pre
+/usr/sbin/groupadd -r epmd &>/dev/null || :
+/usr/sbin/useradd -o -g epmd -s /bin/false -r -c "Erlang Port Mapper Daemon"
-d %{epmd_home} epmd &>/dev/null || :
+
%post
%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null
+%fillup_only erlang
+
+%preun
+%stop_on_removal epmd
+
+%postun
+%restart_on_update epmd
+%{insserv_cleanup}
%files
%defattr(-,root,root)
%doc AUTHORS EPLICENCE README
+%doc %{_libdir}/erlang/PR.template
+%doc %{_libdir}/erlang/README
+%doc %{_libdir}/erlang/COPYRIGHT
%{_bindir}/*
%dir %{_libdir}/erlang
%dir %{_libdir}/erlang/lib/
@@ -305,8 +325,8 @@
%{_libdir}/erlang/lib/cosTime-*/
%{_libdir}/erlang/lib/cosTransactions-*/
%{_libdir}/erlang/lib/crypto-*/
-%{_libdir}/erlang/lib/docbuilder-*/
%{_libdir}/erlang/lib/edoc-*/
+%{_libdir}/erlang/lib/eldap-*/
%{_libdir}/erlang/lib/erl_docgen-*/
%{_libdir}/erlang/lib/erl_interface-*/
%{_libdir}/erlang/lib/erts-*/
@@ -339,12 +359,16 @@
%{_libdir}/erlang/lib/typer-*/
%{_libdir}/erlang/lib/webtool-*/
%{_libdir}/erlang/lib/xmerl-*/
-%{_mandir}/man?/*.gz
+%{_libdir}/erlang/man/
+%{_mandir}/man1/*.1.gz
%{_libdir}/erlang/misc/
%{_libdir}/erlang/releases/
%{_libdir}/erlang/usr/
%{_libdir}/erlang/Install
%{_datadir}/emacs/site-lisp/erlang.el
+%dir %attr(-,epmd,epmd) %{epmd_home}
+/etc/init.d/epmd
+/var/adm/fillup-templates/sysconfig.erlang
%files debugger
%defattr(-,root,root)
++++++ epmd.init ++++++
#!/bin/sh
# Copyright (c) 2012 Marcus Rueckert <da...@nordisch.org>
# All rights reserved.
#
# Author: Marcus Rueckert <da...@nordisch.org>
#
# /etc/init.d/epmd
# and its symbolic link
# /(usr/)sbin/rcepmd
#
# Template system startup script for some example service/daemon epmd
#
# LSB compatible service control script; see http://www.linuxbase.org/spec/
#
# Note: This template uses functions rc_XXX defined in /etc/rc.status on
# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your
# script on this template and ensure that it works on non UL based LSB
# compliant Linux distributions, you either have to provide the rc.status
# functions from UL or change the script to work without them.
# See skeleton.compat for a template that works with other distros as well.
#
### BEGIN INIT INFO
# Provides: epmd
# Required-Start: $syslog $remote_fs
# Should-Start: $time
# Required-Stop: $syslog $remote_fs
# Should-Stop: $null
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: Erlang Port Mapper Daemon
# Description: Erlang Port Mapper Daemon
### END INIT INFO
#
# Any extensions to the keywords given above should be preceeded by
# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB.
#
# Notes on Required-Start/Should-Start:
# * There are two different issues that are solved by Required-Start
# and Should-Start
# (a) Hard dependencies: This is used by the runlevel editor to determine
# which services absolutely need to be started to make the start of
# this service make sense. Example: nfsserver should have
# Required-Start: $portmap
# Also, required services are started before the dependent ones.
# The runlevel editor will warn about such missing hard dependencies
# and suggest enabling. During system startup, you may expect an error,
# if the dependency is not fulfilled.
# (b) Specifying the init script ordering, not real (hard) dependencies.
# This is needed by insserv to determine which service should be
# started first (and at a later stage what services can be started
# in parallel). The tag Should-Start: is used for this.
# It tells, that if a service is available, it should be started
# before. If not, never mind.
# * When specifying hard dependencies or ordering requirements, you can
# use names of services (contents of their Provides: section)
# or pseudo names starting with a $. The following ones are available
# according to LSB (1.1):
# $local_fs all local file systems are mounted
# (most services should need this!)
# $remote_fs all remote file systems are mounted
# (note that /usr may be remote, so
# many services should Require this!)
# $syslog system logging facility up
# $network low level networking (eth card, ...)
# $named hostname resolution available
# $netdaemons all network daemons are running
# The $netdaemons pseudo service has been removed in LSB 1.2.
# For now, we still offer it for backward compatibility.
# These are new (LSB 1.2):
# $time the system time has been set correctly
# $portmap SunRPC portmapping service available
# UnitedLinux extensions:
# $ALL indicates that a script should be inserted
# at the end
# * The services specified in the stop tags
# (Required-Stop/Should-Stop)
# specify which services need to be still running when this service
# is shut down. Often the entries there are just copies or a subset
# from the respective start tag.
# * Should-Start/Stop are now part of LSB as of 2.0,
# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop.
# insserv does support both variants.
# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time
# (%fillup_and_insserv macro in %post of many RPMs) to specify whether
# a startup script should default to be enabled after installation.
# It's not used by insserv.
#
# Note on runlevels:
# 0 - halt/poweroff 6 - reboot
# 1 - single user 2 - multiuser without network exported
# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm)
#
# Note on script names:
# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html
# A registry has been set up to manage the init script namespace.
# http://www.lanana.org/
# Please use the names already registered or register one or use a
# vendor prefix.
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
EPMD_BIN=/usr/bin/epmd
test -x $EPMD_BIN || { echo "$EPMD_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
# Check for existence of needed config file and read it
EPMD_CONFIG=/etc/sysconfig/erlang
test -r $EPMD_CONFIG || { echo "$EPMD_CONFIG not existing";
if [ "$1" = "stop" ]; then exit 0;
else exit 6; fi; }
# Read config
. $EPMD_CONFIG
# Source LSB init functions
# providing start_daemon, killproc, pidofproc,
# log_success_msg, log_failure_msg and log_warning_msg.
# This is currently not used by UnitedLinux based distributions and
# not needed for init scripts for UnitedLinux only. If it is used,
# the functions from rc.status should not be sourced or used.
#. /lib/lsb/init-functions
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
# rc_status -v be verbose in local rc status and clear it afterwards
# rc_status -v -r ditto and clear both the local and overall rc status
# rc_status -s display "skipped" and exit with status 3
# rc_status -u display "unused" and exit with status 3
# rc_failed set local and overall rc status to failed
# rc_failed <num> set local and overall rc status to <num>
# rc_reset clear both the local and overall rc status
# rc_exit exit appropriate to overall rc status
# rc_active checks whether a service is activated by symlinks
. /etc/rc.status
# Reset status of this service
rc_reset
# Return values acc. to LSB for all commands but status:
# 0 - success
# 1 - generic or unspecified error
# 2 - invalid or excess argument(s)
# 3 - unimplemented feature (e.g. "reload")
# 4 - user had insufficient privileges
# 5 - program is not installed
# 6 - program is not configured
# 7 - program is not running
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
# considered a success.
case "$1" in
start)
echo -n "Starting epmd "
## Start daemon with startproc(8). If this fails
## the return value is set appropriately by startproc.
/sbin/startproc -u epmd -g epmd \
$EPMD_BIN \
-daemon \
-address "${EPMD_ADDRESSES:-127.0.0.1}" \
-port "${EPMD_PORT:-4369}"
# Remember status and be verbose
rc_status -v
;;
stop)
echo -n "Shutting down epmd "
## Stop daemon with killproc(8) and if this fails
## killproc sets the return value according to LSB.
if [ $($EPMD_BIN -names | wc -l) -gt 1 ] ; then
echo "\nEPMD is still used" >&2
$EPMD_BIN -names
rc_failed
else
$EPMD_BIN -kill
fi
# Remember status and be verbose
rc_status -v
;;
try-restart|condrestart)
## Do a restart only if the service was active before.
## Note: try-restart is now part of LSB (as of 1.9).
## RH has a similar command named condrestart.
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than
condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
# Remember status and be quiet
rc_status
;;
restart)
## Stop the service and regardless of whether it was
## running or not, start it again.
$0 stop
$0 start
# Remember status and be quiet
rc_status
;;
status)
echo "Checking for service epmd "
## Check status with checkproc(8), if process is running
## checkproc will return with exit status 0.
# Return value is slightly different for the status command:
# 0 - service up and running
# 1 - service dead, but /var/run/ pid file exists
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running (unused)
# 4 - service status unknown :-(
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
# NOTE: checkproc returns LSB compliant status values.
/sbin/checkproc $EPMD_BIN
$EPMD_BIN -names
# NOTE: rc_status knows that we called this init script with
# "status" option and adapts its messages accordingly.
rc_status -v
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart}"
exit 1
;;
esac
rc_exit
++++++ erlang.sysconfig ++++++
## Path: Network/Erlang/epmd
## Description: epmd port
## Type: string
## Default: "127.0.0.1"
## ServiceRestart: epmd
#
# IPs that EPMD should listen on.
# Comma seperated
#
EPMD_ADDRESSES="127.0.0.1"
## Path: Network/Erlang/epmd
## Description: epmd port
## Type: string
## Default: "4369"
## ServiceRestart: epmd
#
# Options for sshd
#
EPMD_PORT=""
++++++ otp-R14B04-rpath.patch -> otp-R15B02-rpath.patch ++++++
--- /work/SRC/openSUSE:Factory/erlang/otp-R14B04-rpath.patch 2011-11-14
11:50:17.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.erlang.new/otp-R15B02-rpath.patch
2012-11-18 20:25:35.000000000 +0100
@@ -1,18 +1,18 @@
-diff -U 3 -H -d -r -N -x '.svn/*' --
otp_src_R14B04/lib/crypto/c_src/Makefile.in
otp_src_R14B04.rpath/lib/crypto/c_src/Makefile.in
---- otp_src_R14B04/lib/crypto/c_src/Makefile.in 2011-10-03
20:12:07.000000000 +0200
-+++ otp_src_R14B04.rpath/lib/crypto/c_src/Makefile.in 2011-10-10
22:17:08.719135582 +0200
+diff -U 3 -H -d -r -N -x .git -x .svn --
otp_src_R15B02/lib/crypto/c_src/Makefile.in
otp_src_R15B02.rpath/lib/crypto/c_src/Makefile.in
+--- otp_src_R15B02/lib/crypto/c_src/Makefile.in 2012-09-03
11:58:05.000000000 +0200
++++ otp_src_R15B02.rpath/lib/crypto/c_src/Makefile.in 2012-09-06
10:46:02.489523363 +0200
@@ -84,7 +84,7 @@
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
- CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR)
-l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
+ CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR)
-l$(SSL_CRYPTO_LIBNAME)
else
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
-diff -U 3 -H -d -r -N -x '.svn/*' -- otp_src_R14B04/lib/crypto/priv/Makefile
otp_src_R14B04.rpath/lib/crypto/priv/Makefile
---- otp_src_R14B04/lib/crypto/priv/Makefile 2011-10-03 20:12:07.000000000
+0200
-+++ otp_src_R14B04.rpath/lib/crypto/priv/Makefile 2011-10-10
22:15:25.967733492 +0200
+diff -U 3 -H -d -r -N -x .git -x .svn --
otp_src_R15B02/lib/crypto/priv/Makefile
otp_src_R15B02.rpath/lib/crypto/priv/Makefile
+--- otp_src_R15B02/lib/crypto/priv/Makefile 2012-09-03 11:58:05.000000000
+0200
++++ otp_src_R15B02.rpath/lib/crypto/priv/Makefile 2012-09-06
10:44:45.419641096 +0200
@@ -60,7 +60,7 @@
# ----------------------------------------------------
@@ -22,18 +22,15 @@
-o $@ $^ -lcrypto
$(DLL_NIFLIB): $(OBJS)
-diff -U 3 -H -d -r -N -x '.svn/*' -- otp_src_R14B04/lib/ssl/c_src/Makefile.in
otp_src_R14B04.rpath/lib/ssl/c_src/Makefile.in
---- otp_src_R14B04/lib/ssl/c_src/Makefile.in 2011-10-03 20:12:07.000000000
+0200
-+++ otp_src_R14B04.rpath/lib/ssl/c_src/Makefile.in 2011-10-10
22:15:25.975733445 +0200
-@@ -117,9 +117,9 @@
- CC_R_FLAG =
- else
- ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath,
--CC_R_FLAG = -Wl,-rpath,
-+CC_R_FLAG =
- else # Default: -Wl,-R
--CC_R_FLAG = -Wl,-R
-+CC_R_FLAG =
- endif
- endif
- endif
+diff -U 3 -H -d -r -N -x .git -x .svn --
otp_src_R15B02/lib/odbc/c_src/odbcserver.c
otp_src_R15B02.rpath/lib/odbc/c_src/odbcserver.c
+--- otp_src_R15B02/lib/odbc/c_src/odbcserver.c 2012-09-03 11:58:05.000000000
+0200
++++ otp_src_R15B02.rpath/lib/odbc/c_src/odbcserver.c 2012-09-06
10:44:45.420641107 +0200
+@@ -104,6 +104,8 @@
+
+ #ifdef UNIX
+ #include <unistd.h>
++#include <ctype.h>
++#include <arpa/inet.h>
+ #endif
+
+ #if defined WIN32
++++++ otp_doc_html_R14B04.tar.gz -> otp_doc_html_R15B02.tar.gz ++++++
/work/SRC/openSUSE:Factory/erlang/otp_doc_html_R14B04.tar.gz
/work/SRC/openSUSE:Factory/.erlang.new/otp_doc_html_R15B02.tar.gz differ: char
5, line 1
++++++ otp_doc_man_R14B04.tar.gz -> otp_doc_man_R15B02.tar.gz ++++++
++++ 192292 lines of diff (skipped)
++++++ otp_src_R14B04.tar.gz -> otp_src_R15B02.tar.gz ++++++
/work/SRC/openSUSE:Factory/erlang/otp_src_R14B04.tar.gz
/work/SRC/openSUSE:Factory/.erlang.new/otp_src_R15B02.tar.gz differ: char 5,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
