- updated to 2.4.8

- updated make patch

diff --git a/make.patch b/make.patch
index 29288f62ecbd4ba8bb17151db62e2a63e3ee8d43..fd9764b5d1dbaabebda4ed53b7b9e6e8a53450e3 100644 (file)
--- a/make.patch
+++ b/make.patch
@@ -1,15 +1,14 @@
-diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensips-2.4.0/Makefile
---- opensips-2.4.0.orig/Makefile       2018-04-30 21:37:06.000000000 +0900
-+++ opensips-2.4.0/Makefile    2018-05-23 19:45:30.853360012 +0900
-@@ -49,7 +49,6 @@
- # default debian version when running 'make deb'
- DEBIAN_VERSION ?= jessie #TODO: can we determine this?
+--- opensips-2.4.8/Makefile.orig       2020-06-15 17:14:49.000000000 +0200
++++ opensips-2.4.8/Makefile    2020-10-09 20:17:09.301016848 +0200
+@@ -46,7 +46,6 @@
+ # whether or not to overwrite TLS certificates
+ tls_overwrite_certs?=
  
 -makefile_defs=0
  DEFS:= $(DEFS_EXTRA_OPTS)
  DEBUG_PARSER?=
  
-@@ -467,7 +466,7 @@
+@@ -474,7 +473,7 @@
  # Install everything (except modules-docbook?)
  install: install-app install-console install-modules-all
  
@@ -18,7 +17,7 @@ diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensip
        $(MAKE) -C menuconfig proper
        $(MAKE) -C menuconfig \
                MENUCONFIG_CFG_PATH=$(data_target)/menuconfig_templates/ \
-@@ -484,14 +483,14 @@
+@@ -491,14 +490,14 @@
        $(MAKE) -C db/schema
        -@echo "Done"
  
@@ -38,7 +37,7 @@ diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensip
                sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules_target)#g" \
                        < etc/$(NAME).cfg > $(cfg_prefix)/$(cfg_dir)$(NAME).cfg.sample0
                umask 0077; sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg_target)tls/#g" \
-@@ -500,7 +500,7 @@
+@@ -527,7 +526,7 @@
                                $(cfg_prefix)/$(cfg_dir)/osipsconsolerc; \
                fi
  
@@ -47,16 +46,16 @@ diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensip
                # install osipsconsole
                cat scripts/osipsconsole | \
                sed -e "s#PATH_BIN[ \t]*=[ \t]*\"\./\"#PATH_BIN = \"$(bin-target)\"#g" | \
-@@ -529,7 +528,7 @@
+@@ -540,7 +539,7 @@
                $(INSTALL_BIN) /tmp/osipsconsole $(bin_prefix)/$(bin_dir)
                rm -fr /tmp/osipsconsole
  
--install-bin: $(bin_prefix)/$(bin_dir) opensipsmc utils
-+install-bin: $(bin_dir) opensipsmc utils
+-install-bin: app $(bin_prefix)/$(bin_dir) opensipsmc utils
++install-bin: app $(bin_dir) opensipsmc utils
                # install opensips binary
                $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
                $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
-@@ -604,7 +603,7 @@
+@@ -611,7 +610,7 @@
                        cd utils/db_oracle; $(MAKE) all ; \
                fi ;
  
@@ -65,7 +64,7 @@ diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensip
        @for r in $(modules_full_path) "" ; do \
                if [ -n "$$r" ]; then \
                        if [ -f "$$r" ]; then \
-@@ -622,7 +621,7 @@
+@@ -629,7 +628,7 @@
  .PHONY: install-doc install-app-doc install-modules-doc
  install-doc: install-app-doc install-modules-doc
  
@@ -74,7 +73,7 @@ diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensip
        -@for d in $(install_docs) ""; do \
                if [ -n "$$d" ]; then \
                        $(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$d" ; \
-@@ -632,7 +631,7 @@
+@@ -638,7 +637,7 @@
        done
  
  
@@ -83,7 +82,7 @@ diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensip
        -@for r in $(modules_basenames) "" ; do \
                if [ -n "$$r" ]; then \
                        if [ -f modules/"$$r"/README ]; then \
-@@ -642,7 +641,7 @@
+@@ -650,7 +649,7 @@
        done
  
  
@@ -92,7 +91,7 @@ diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile opensip
                sed -e "s#/etc/$(NAME)/$(NAME)\.cfg#$(cfg_target)$(NAME).cfg#g" \
                        -e "s#/usr/sbin/#$(bin-target)#g" \
                        -e "s#/usr/lib/$(NAME)/modules/#$(modules_target)#g" \
-@@ -652,7 +651,7 @@
+@@ -677,7 +676,7 @@
                        $(man_prefix)/$(man_dir)/man8/opensipsunix.8
                chmod 644  $(man_prefix)/$(man_dir)/man8/opensipsunix.8
  

diff --git a/opensips.spec b/opensips.spec
index 0a8ec5cacc93ece4406e50281daacf7cd4025b11..3b760faf5969c1325b3bf9d9804ee51448aaff24 100644 (file)
--- a/opensips.spec
+++ b/opensips.spec
@@ -1,6 +1,7 @@
+# TODO: oracle, lua (lua5.1)
 #
 # Conditional build:
-%bcond_without mysql           # mysql support
+%bcond_without mysql           # MySQL support
 %bcond_without pgsql           # PostgreSQL support
 %bcond_without sqlite          # Sqlite3 support
 %bcond_without odbc            # ODBC support
@@ -21,39 +22,41 @@
 Summary:       SIP proxy, redirect and registrar server
 Summary(pl.UTF-8):     Serwer SIP przekazujący (proxy), przekierowujący i rejestrujący
 Name:          opensips
-Version:       2.4.0
-Release:       7
+Version:       2.4.8
+Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
-Source0:       http://opensips.org/pub/opensips/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 0aafe11a30d9724784922667fb98b303
+Source0:       https://opensips.org/pub/opensips/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 02ae0094e94d56cb175a542c52a25e39
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.service
 Patch0:                x32.patch
 Patch1:                make.patch
 Patch2:                json-c-0.14.patch
-URL:           http://www.opensips.org/
-%{?with_geoip:BuildRequires:   GeoIP-devel}
+URL:           https://opensips.org/
 %{?with_osp:BuildRequires:     OSPToolkit}
 %{?with_sngtc:BuildRequires:    TODO-SNGTC-BRs}
 BuildRequires: bison
 BuildRequires: curl-devel
+BuildRequires: db-devel
 BuildRequires: expat-devel
 BuildRequires: flex
 %{?with_redis:BuildRequires:   hiredis-devel}
 %{?with_json:BuildRequires:    json-c-devel}
 %{?with_carrierroute:BuildRequires:    libconfuse-devel}
 %{?with_couchbase:BuildRequires:    libcouchbase-devel}
+%{?with_geoip:BuildRequires:   libmaxminddb-devel}
 %{?with_memcached:BuildRequires:       libmemcached-devel}
 %{?with_microhttpd:BuildRequires:      libmicrohttpd-devel}
-%{?with_mongodb:BuildRequires: libmongo-client-devel}
 %{?with_pgsql:BuildRequires:   libpqxx-devel}
 BuildRequires: libsctp-devel
+%{?with_osp:BuildRequires:     libutf8proc-devel}
 BuildRequires: libuuid-devel
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2.0
 BuildRequires: libxslt-progs
 #BuildRequires:        lynx
+%{?with_mongodb:BuildRequires: mongo-c-driver-devel >= 1.0}
 %{?with_mysql:BuildRequires:   mysql-devel}
 BuildRequires: net-snmp-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
@@ -61,11 +64,13 @@ BuildRequires:      openssl-devel
 BuildRequires: pcre-devel
 BuildRequires: perl-devel
 BuildRequires: perl-tools-devel
+BuildRequires: pkgconfig
+BuildRequires: python-devel >= 1:2.5
 %{?with_rabbitmq:BuildRequires:        rabbitmq-c-devel}
 %{?with_radius:BuildRequires:  radiusclient-ng-devel}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.671
-%{?with_sqlite:BuildRequires:  sqlite3-devel}
+%{?with_sqlite:BuildRequires:  sqlite3-devel >= 3}
 #BuildRequires:        subversion
 %{?with_odbc:BuildRequires:    unixODBC-devel}
 BuildRequires: which
@@ -470,11 +475,18 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README* AUTHORS CREDITS ChangeLog INSTALL NEWS scripts examples
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/bdb_recover
+%attr(755,root,root) %{_sbindir}/opensips
+%attr(755,root,root) %{_sbindir}/opensipsctl
+%attr(755,root,root) %{_sbindir}/opensipsdbctl
+%attr(755,root,root) %{_sbindir}/opensipsunix
+%attr(755,root,root) %{_sbindir}/osipsconfig
+%attr(755,root,root) %{_sbindir}/osipsconsole
 %dir %{_sysconfdir}/opensips
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/opensips.cfg
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/opensipsctlrc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/osipsconsolerc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/scenario_callcenter.xml
 %dir %attr(700,root,root) %{_sysconfdir}/opensips/tls
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/tls/README
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/tls/ca.conf
@@ -498,7 +510,8 @@ fi
 %{systemdunitdir}/opensips.service
 %dir %{_libdir}/opensips
 %dir %{_libdir}/opensips/opensipsctl
-%{_libdir}/opensips/opensipsctl/*.*
+%{_libdir}/opensips/opensipsctl/opensipsctl.*
+%{_libdir}/opensips/opensipsctl/opensipsdbctl.*
 %dir %{_libdir}/opensips/opensipsctl/dbtextdb
 %attr(755,root,root) %{_libdir}/opensips/opensipsctl/dbtextdb/dbtextdb.py
 %dir %{_libdir}/opensips/modules
@@ -633,7 +646,10 @@ fi
 %{_datadir}/%{name}/dbtext
 %{_datadir}/%{name}/menuconfig_templates
 %{_datadir}/%{name}/pi_http
-%{_mandir}/man*/*
+%{_mandir}/man5/opensips.cfg.5*
+%{_mandir}/man8/opensips.8*
+%{_mandir}/man8/opensipsctl.8*
+%{_mandir}/man8/opensipsunix.8*
 
 %files xmpp
 %defattr(644,root,root,755)