Index: head/devel/libosmocore/Makefile =================================================================== --- head/devel/libosmocore/Makefile (revision 502287) +++ head/devel/libosmocore/Makefile (revision 502288) @@ -1,45 +1,47 @@ # $FreeBSD$ PORTNAME= libosmocore -PORTVERSION= 0.12.1 +PORTVERSION= 1.1.0 CATEGORIES= devel MASTER_SITES= http://git.osmocom.org/libosmocore/snapshot/ \ http://chaosophia.net/downloads/osmocom/${PORTNAME}/ MAINTAINER= koue@chaosophia.net COMMENT= Common library for all Osmocom projects LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:security/gnutls \ libpcsclite.so:devel/pcsc-lite \ libtalloc.so:devel/talloc -USES= alias autoreconf gmake libtool pathfix pkgconfig python:2.7 shebangfix +USES= alias autoreconf gmake libtool pathfix pkgconfig python:2.7 \ + shebangfix + GNU_CONFIGURE= yes LDFLAGS+= -lexecinfo USE_LDCONFIG= yes INSTALL_TARGET= install-strip PORTDOCS= * SHEBANG_FILES= utils/conv_codes_gsm.py utils/conv_gen.py python_OLD_CMD= /usr/bin/python2 -OPTIONS_DEFINE= DOXYGEN DOCS +OPTIONS_DEFINE= DOCS DOXYGEN -DOXYGEN_IMPLIES= DOCS -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - dot:graphics/graphviz -DOXYGEN_CONFIGURE_ENV_OFF=ac_cv_path_DOXYGEN=false +DOXYGEN_IMPLIES= DOCS +DOXYGEN_BUILD_DEPENDS= dot:graphics/graphviz \ + doxygen:devel/doxygen +DOXYGEN_CONFIGURE_ENV_OFF= ac_cv_path_DOXYGEN=false post-patch: ${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version @${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' \ ${WRKSRC}/src/application.c @${REINPLACE_CMD} -e 's/python2/${PYTHON_VERSION}/' \ -e 's,(AM_V_GEN)python ,(AM_V_GEN)${PYTHON_VERSION} ,' \ ${WRKSRC}/include/Makefile.am \ ${WRKSRC}/src/gsm/Makefile.am \ ${WRKSRC}/tests/Makefile.am .include Index: head/devel/libosmocore/distinfo =================================================================== --- head/devel/libosmocore/distinfo (revision 502287) +++ head/devel/libosmocore/distinfo (revision 502288) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535369943 -SHA256 (libosmocore-0.12.1.tar.gz) = 65672f48378cb6546d7ea76d2f86797cfa542a965241edcead1c69e0588a7529 -SIZE (libosmocore-0.12.1.tar.gz) = 1050105 +TIMESTAMP = 1558516456 +SHA256 (libosmocore-1.1.0.tar.gz) = 719372e536c47ead59aa2c56529cd8aa8d58875fc692bfe526f71e1cf85dad5a +SIZE (libosmocore-1.1.0.tar.gz) = 1210793 Index: head/devel/libosmocore/files/patch-src_gb_gprs__ns__sns.c =================================================================== --- head/devel/libosmocore/files/patch-src_gb_gprs__ns__sns.c (nonexistent) +++ head/devel/libosmocore/files/patch-src_gb_gprs__ns__sns.c (revision 502288) @@ -0,0 +1,11 @@ +--- src/gb/gprs_ns_sns.c.orig 2019-05-22 09:31:16 UTC ++++ src/gb/gprs_ns_sns.c +@@ -11,6 +11,8 @@ + #include + #include + ++#include ++ + #include + #include + #include Property changes on: head/devel/libosmocore/files/patch-src_gb_gprs__ns__sns.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/libosmocore/files/patch-src_sockaddr__str.c =================================================================== --- head/devel/libosmocore/files/patch-src_sockaddr__str.c (nonexistent) +++ head/devel/libosmocore/files/patch-src_sockaddr__str.c (revision 502288) @@ -0,0 +1,11 @@ +--- src/sockaddr_str.c.orig 2019-05-22 09:18:33 UTC ++++ src/sockaddr_str.c +@@ -38,6 +38,8 @@ + #include + #include + ++#include ++ + /*! \addtogroup sockaddr_str + * + * Common operations to store IP address as a char string along with a uint16_t port number. Property changes on: head/devel/libosmocore/files/patch-src_sockaddr__str.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/libosmocore/files/patch-src_timer__clockgettime.c =================================================================== --- head/devel/libosmocore/files/patch-src_timer__clockgettime.c (revision 502287) +++ head/devel/libosmocore/files/patch-src_timer__clockgettime.c (revision 502288) @@ -1,27 +1,27 @@ ---- src/timer_clockgettime.c.orig 2018-07-18 15:04:27 UTC +--- src/timer_clockgettime.c.orig 2019-05-07 16:36:51 UTC +++ src/timer_clockgettime.c -@@ -72,16 +72,16 @@ static struct fakeclock* clkid_to_fakecl +@@ -75,16 +75,16 @@ static struct fakeclock* clkid_to_fakeclock(clockid_t switch(clk_id) { case CLOCK_REALTIME: return &realtime; - case CLOCK_REALTIME_COARSE: - return &realtime_coarse; +// case CLOCK_REALTIME_COARSE: +// return &realtime_coarse; case CLOCK_MONOTONIC: return &mono; - case CLOCK_MONOTONIC_COARSE: - return &mono_coarse; - case CLOCK_MONOTONIC_RAW: - return &mono_raw; - case CLOCK_BOOTTIME: - return &boottime; +// case CLOCK_MONOTONIC_COARSE: +// return &mono_coarse; +// case CLOCK_MONOTONIC_RAW: +// return &mono_raw; +// case CLOCK_BOOTTIME: +// return &boottime; case CLOCK_PROCESS_CPUTIME_ID: return &proc_cputime_id; case CLOCK_THREAD_CPUTIME_ID: Index: head/devel/libosmocore/pkg-plist =================================================================== --- head/devel/libosmocore/pkg-plist (revision 502287) +++ head/devel/libosmocore/pkg-plist (revision 502288) @@ -1,170 +1,182 @@ bin/osmo-arfcn bin/osmo-auc-gen +bin/osmo-config-merge bin/osmo-release.sh include/osmo-release.mk include/osmocom/codec/codec.h include/osmocom/codec/ecu.h include/osmocom/codec/gsm610_bits.h include/osmocom/coding/gsm0503_coding.h include/osmocom/coding/gsm0503_interleaving.h include/osmocom/coding/gsm0503_mapping.h include/osmocom/coding/gsm0503_parity.h include/osmocom/coding/gsm0503_tables.h include/osmocom/core/application.h include/osmocom/core/backtrace.h include/osmocom/core/bit16gen.h include/osmocom/core/bit32gen.h include/osmocom/core/bit64gen.h include/osmocom/core/bitcomp.h include/osmocom/core/bits.h include/osmocom/core/bitvec.h include/osmocom/core/byteswap.h include/osmocom/core/conv.h include/osmocom/core/counter.h include/osmocom/core/crc16.h include/osmocom/core/crc16gen.h include/osmocom/core/crc32gen.h include/osmocom/core/crc64gen.h include/osmocom/core/crc8gen.h include/osmocom/core/crcgen.h include/osmocom/core/defs.h include/osmocom/core/endian.h include/osmocom/core/fsm.h include/osmocom/core/gsmtap.h include/osmocom/core/gsmtap_util.h include/osmocom/core/isdnhdlc.h include/osmocom/core/linuxlist.h include/osmocom/core/linuxrbtree.h include/osmocom/core/logging.h include/osmocom/core/loggingrb.h include/osmocom/core/macaddr.h include/osmocom/core/msgb.h include/osmocom/core/msgfile.h include/osmocom/core/panic.h include/osmocom/core/plugin.h include/osmocom/core/prbs.h include/osmocom/core/prim.h include/osmocom/core/process.h include/osmocom/core/rate_ctr.h include/osmocom/core/select.h include/osmocom/core/sercomm.h include/osmocom/core/serial.h include/osmocom/core/signal.h +include/osmocom/core/sockaddr_str.h include/osmocom/core/socket.h include/osmocom/core/stat_item.h include/osmocom/core/statistics.h include/osmocom/core/stats.h include/osmocom/core/strrb.h include/osmocom/core/talloc.h +include/osmocom/core/tdef.h include/osmocom/core/timer.h include/osmocom/core/timer_compat.h +include/osmocom/core/use_count.h include/osmocom/core/utils.h include/osmocom/core/write_queue.h include/osmocom/crypt/auth.h include/osmocom/crypt/gprs_cipher.h include/osmocom/ctrl/control_cmd.h include/osmocom/ctrl/control_if.h include/osmocom/ctrl/control_vty.h include/osmocom/ctrl/ports.h include/osmocom/gprs/gprs_bssgp.h include/osmocom/gprs/gprs_bssgp_bss.h include/osmocom/gprs/gprs_msgb.h include/osmocom/gprs/gprs_ns.h include/osmocom/gprs/gprs_ns_frgre.h include/osmocom/gprs/gprs_rlc.h include/osmocom/gprs/protocol/gsm_04_60.h include/osmocom/gprs/protocol/gsm_08_16.h include/osmocom/gprs/protocol/gsm_08_18.h include/osmocom/gsm/a5.h include/osmocom/gsm/abis_nm.h include/osmocom/gsm/apn.h include/osmocom/gsm/bitvec_gsm.h include/osmocom/gsm/bts_features.h include/osmocom/gsm/comp128.h include/osmocom/gsm/comp128v23.h include/osmocom/gsm/gan.h include/osmocom/gsm/gsm0341.h include/osmocom/gsm/gsm0411_smc.h include/osmocom/gsm/gsm0411_smr.h include/osmocom/gsm/gsm0411_utils.h include/osmocom/gsm/gsm0480.h include/osmocom/gsm/gsm0502.h include/osmocom/gsm/gsm0503.h include/osmocom/gsm/gsm0808.h include/osmocom/gsm/gsm0808_utils.h include/osmocom/gsm/gsm23003.h +include/osmocom/gsm/gsm29118.h +include/osmocom/gsm/gsm29205.h include/osmocom/gsm/gsm48.h +include/osmocom/gsm/gsm48_arfcn_range_encode.h include/osmocom/gsm/gsm48_ie.h +include/osmocom/gsm/gsm48_rest_octets.h include/osmocom/gsm/gsm_utils.h include/osmocom/gsm/gsup.h +include/osmocom/gsm/gsup_sms.h include/osmocom/gsm/ipa.h include/osmocom/gsm/l1sap.h include/osmocom/gsm/lapd_core.h include/osmocom/gsm/lapdm.h include/osmocom/gsm/meas_rep.h include/osmocom/gsm/mncc.h include/osmocom/gsm/oap.h +include/osmocom/gsm/oap_client.h include/osmocom/gsm/prim.h include/osmocom/gsm/protocol/gsm_03_40.h include/osmocom/gsm/protocol/gsm_03_41.h include/osmocom/gsm/protocol/gsm_04_08.h include/osmocom/gsm/protocol/gsm_04_08_gprs.h include/osmocom/gsm/protocol/gsm_04_11.h include/osmocom/gsm/protocol/gsm_04_12.h include/osmocom/gsm/protocol/gsm_04_14.h include/osmocom/gsm/protocol/gsm_04_80.h include/osmocom/gsm/protocol/gsm_08_08.h include/osmocom/gsm/protocol/gsm_08_58.h include/osmocom/gsm/protocol/gsm_09_02.h include/osmocom/gsm/protocol/gsm_12_21.h include/osmocom/gsm/protocol/gsm_23_003.h +include/osmocom/gsm/protocol/gsm_29_118.h include/osmocom/gsm/protocol/gsm_44_318.h include/osmocom/gsm/protocol/ipaccess.h include/osmocom/gsm/protocol/smpp34_osmocom.h include/osmocom/gsm/rsl.h include/osmocom/gsm/rxlev_stat.h include/osmocom/gsm/sysinfo.h include/osmocom/gsm/tlv.h include/osmocom/sim/class_tables.h include/osmocom/sim/sim.h include/osmocom/vty/buffer.h include/osmocom/vty/command.h include/osmocom/vty/logging.h include/osmocom/vty/misc.h include/osmocom/vty/ports.h include/osmocom/vty/stats.h +include/osmocom/vty/tdef_vty.h include/osmocom/vty/telnet_interface.h include/osmocom/vty/vector.h include/osmocom/vty/vty.h lib/libosmocodec.so lib/libosmocodec.so.0 lib/libosmocodec.so.0.1.1 lib/libosmocoding.so lib/libosmocoding.so.0 lib/libosmocoding.so.0.1.1 lib/libosmocore.so -lib/libosmocore.so.11 -lib/libosmocore.so.11.0.0 +lib/libosmocore.so.12 +lib/libosmocore.so.12.1.0 lib/libosmoctrl.so lib/libosmoctrl.so.0 lib/libosmoctrl.so.0.3.0 lib/libosmogb.so -lib/libosmogb.so.6 -lib/libosmogb.so.6.1.0 +lib/libosmogb.so.9 +lib/libosmogb.so.9.0.0 lib/libosmogsm.so -lib/libosmogsm.so.10 -lib/libosmogsm.so.10.0.0 +lib/libosmogsm.so.12 +lib/libosmogsm.so.12.0.0 lib/libosmosim.so lib/libosmosim.so.0 -lib/libosmosim.so.0.0.2 +lib/libosmosim.so.0.1.0 lib/libosmovty.so lib/libosmovty.so.4 -lib/libosmovty.so.4.1.0 +lib/libosmovty.so.4.3.0 libdata/pkgconfig/libosmocodec.pc libdata/pkgconfig/libosmocoding.pc libdata/pkgconfig/libosmocore.pc libdata/pkgconfig/libosmoctrl.pc libdata/pkgconfig/libosmogb.pc libdata/pkgconfig/libosmogsm.pc libdata/pkgconfig/libosmosim.pc libdata/pkgconfig/libosmovty.pc