From ca2c1da3f41f23f4a7fb8e8e50e5f5db75b7b09a Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 15 Jan 2023 10:45:04 +0300
Subject: [PATCH] mpg123-1.31.2
---
AUTHORS | 2 ++
NEWS | 6 ++++++
configure | 22 +++++++++++-----------
configure.ac | 4 ++--
mpg123.spec | 2 +-
src/resolver.c | 3 +++
6 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 3321f0b..f7a792a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,6 +30,8 @@ The creator: Michael Hipp (email: hippm@informatik.uni-tuebingen.de - please bot
Contributions/ideas Thomas Orgis era (includes backports from mhipp trunk):
+Dave Yeo <dave.r.yeo@gmail.com>: continued OS/2 fixing
+madebr and manx: github mirror and CI
Vitaly Kirsanov <krokoziabla@gmail.com>: ports/cmake (optional CMake build)
Won-Kyu Park <wkpark@gmail.com>: patch to get rid of asm textrels (x86 PIC)
Michael Weiser <michaelweiser@users.sf.net>: update of coreaudio output to AudioComponents API
diff --git a/NEWS b/NEWS
index 8d6c815..7b06027 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+1.31.2
+------
+- Fix build --with-network=internal only (configure logic error, bug 348).
+- Fix OS/2 build with getaddrinfo() (which may support IPv6 eventually, thanks
+ to Dave Yeo).
+
1.31.1
------
- Fix largefile aliases for the case of a largefile-insensitive build
diff --git a/configure b/configure
index 2aa6734..c478f85 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mpg123 1.31.1.
+# Generated by GNU Autoconf 2.69 for mpg123 1.31.2.
#
# Report bugs to <maintainer@mpg123.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mpg123'
PACKAGE_TARNAME='mpg123'
-PACKAGE_VERSION='1.31.1'
-PACKAGE_STRING='mpg123 1.31.1'
+PACKAGE_VERSION='1.31.2'
+PACKAGE_STRING='mpg123 1.31.2'
PACKAGE_BUGREPORT='maintainer@mpg123.org'
PACKAGE_URL=''
@@ -1687,7 +1687,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mpg123 1.31.1 to adapt to many kinds of systems.
+\`configure' configures mpg123 1.31.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1758,7 +1758,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpg123 1.31.1:";;
+ short | recursive ) echo "Configuration of mpg123 1.31.2:";;
esac
cat <<\_ACEOF
@@ -1999,7 +1999,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpg123 configure 1.31.1
+mpg123 configure 1.31.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2605,7 +2605,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mpg123 $as_me 1.31.1, which was
+It was created by mpg123 $as_me 1.31.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3564,7 +3564,7 @@ fi
# Define the identity of the package.
PACKAGE='mpg123'
- VERSION='1.31.1'
+ VERSION='1.31.2'
cat >>confdefs.h <<_ACEOF
@@ -19630,7 +19630,7 @@ $as_echo "$network_type" >&6; }
fi
# new net123
-if test x$network_type != xinternal -a x$network_type != xdisabled; then
+if test x$network_type != xdisabled; then
$as_echo "#define NET123 1" >>confdefs.h
@@ -20754,7 +20754,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mpg123 $as_me 1.31.1, which was
+This file was extended by mpg123 $as_me 1.31.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20820,7 +20820,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mpg123 config.status 1.31.1
+mpg123 config.status 1.31.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 6d76d50..06c1e83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl 2.69 at least.
AC_PREREQ([2.69])
dnl ############# Initialisation
-AC_INIT([mpg123], [1.31.1], [maintainer@mpg123.org])
+AC_INIT([mpg123], [1.31.2], [maintainer@mpg123.org])
dnl Increment API_VERSION when the API gets changes (new functions).
dnl libmpg123
@@ -2639,7 +2639,7 @@ if test x$network_type = xauto; then
fi
# new net123
-if test x$network_type != xinternal -a x$network_type != xdisabled; then
+if test x$network_type != xdisabled; then
AC_DEFINE([NET123], [1], [ Define to for new net123 network stack. ])
fi
if test x$network_type = xexec -a x$have_fork != xyes; then
diff --git a/mpg123.spec b/mpg123.spec
index 3031dff..e227289 100644
--- a/mpg123.spec
+++ b/mpg123.spec
@@ -3,7 +3,7 @@
# - devel packages for alsa, sdl, etc... to build the respective output modules.
Summary: The fast console mpeg audio decoder/player.
Name: mpg123
-Version: 1.31.1
+Version: 1.31.2
Release: 1
URL: http://www.mpg123.org/
License: GPL
diff --git a/src/resolver.c b/src/resolver.c
index 87af96f..02ba90f 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -25,6 +25,9 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
+#if defined (IPV6) && defined (__OS2__)
+#include <libcx/net.h>
+#endif
#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>