openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2017
- 1 participants
- 1511 discussions
Hello community,
here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2017-12-29 18:52:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old)
and /work/SRC/openSUSE:Factory/.platformsh-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli"
Fri Dec 29 18:52:28 2017 rev:30 rq:560477 version:3.26.1
Changes:
-----…
[View More]---
--- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2017-12-22 12:21:27.204147020 +0100
+++ /work/SRC/openSUSE:Factory/.platformsh-cli.new/platformsh-cli.changes 2017-12-29 18:52:44.949195921 +0100
@@ -1,0 +2,29 @@
+Fri Dec 29 01:36:38 UTC 2017 - jimmy(a)boombatower.com
+
+- Update to version 3.26.1:
+ * Release v3.26.1
+ * Update CHANGELOG.md
+ * Move chmod() to install section of installer
+ * Find latest version regardless of mode in self:build
+ * Restore Phar moving to installer
+ * Remove duplicate message in self:install
+ * Add auth:browser-login command (#669)
+ * Add snippet markers in shell config
+ * Remove old update notes
+ * Remove v2 from manifest.json
+ * Add usage help at the end of self:install
+ * Installer: just invoke self:install
+ * Refactor shell config into separate files
+ * Rename all_features to all_experiments
+ * Add all_features flag
+ * Update default D7 settings files
+ * Unused code
+ * Remove any direct use of remote_env_vars service
+ * Fix route:get options list
+ * Switch route:get to using deployments API (instead of SSH)
+ * Update CHANGELOG.md for v3.26.0
+ * Fix manifest update notes version constraints
+ * Remove extra quotes from git changelog
+ * Fix manifest update notes version constraints
+
+-------------------------------------------------------------------
Old:
----
platformsh-cli-3.26.0.tar.xz
New:
----
platformsh-cli-3.26.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ platformsh-cli.spec ++++++
--- /var/tmp/diff_new_pack.ydfMhf/_old 2017-12-29 18:52:46.024886972 +0100
+++ /var/tmp/diff_new_pack.ydfMhf/_new 2017-12-29 18:52:46.024886972 +0100
@@ -17,7 +17,7 @@
Name: platformsh-cli
-Version: 3.26.0
+Version: 3.26.1
Release: 0
Summary: Tool for managing Platform.sh services from the command line
# See licenses.txt for dependency licenses.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ydfMhf/_old 2017-12-29 18:52:46.068874338 +0100
+++ /var/tmp/diff_new_pack.ydfMhf/_new 2017-12-29 18:52:46.072873190 +0100
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="revision">refs/tags/v3.26.0</param>
+ <param name="revision">refs/tags/v3.26.1</param>
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.ydfMhf/_old 2017-12-29 18:52:46.096866299 +0100
+++ /var/tmp/diff_new_pack.ydfMhf/_new 2017-12-29 18:52:46.096866299 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
- <param name="changesrevision">c610714bfa603427bd701b12eedb8e1d6be0f75f</param>
+ <param name="changesrevision">739e783bffc5ce6c2b401ebf495e0397135596cf</param>
</service>
</servicedata>
++++++ extensions.txt ++++++
--- /var/tmp/diff_new_pack.ydfMhf/_old 2017-12-29 18:52:46.136854814 +0100
+++ /var/tmp/diff_new_pack.ydfMhf/_new 2017-12-29 18:52:46.136854814 +0100
@@ -3,22 +3,22 @@
[requires] => Array
(
[0] => php >=5.2.0
- [1] => php >=5.3
- [2] => php >=5.3.0
+ [1] => php >=5.2.0
+ [2] => php >=5.3
[3] => php >=5.3.0
[4] => php >=5.3.0
- [5] => php >=5.3.2
- [6] => php >=5.3.3
+ [5] => php >=5.3.0
+ [6] => php >=5.3.2
[7] => php >=5.3.3
- [8] => php >=5.4.0
+ [8] => php >=5.3.3
[9] => php >=5.4.0
[10] => php >=5.4.0
[11] => php >=5.4.0
[12] => php >=5.4.0
- [13] => php >=5.5.9
+ [13] => php >=5.4.0
[14] => php >=5.5.9
[15] => php >=5.5.9
- [16] => php ^5.5.9|>=7.0.8
+ [16] => php >=5.5.9
[17] => php ^5.5.9|>=7.0.8
[18] => php ^5.5.9|>=7.0.8
[19] => php ^5.5.9|>=7.0.8
@@ -27,13 +27,15 @@
[22] => php ^5.5.9|>=7.0.8
[23] => php ^5.5.9|>=7.0.8
[24] => php ^5.5.9|>=7.0.8
- [25] => php ~5.5|~7.0
+ [25] => php ^5.5.9|>=7.0.8
+ [26] => php ~5.5|~7.0
)
[suggests] => Array
(
[0] => ext-curl Guzzle will use specific adapters if cURL is present
- [1] => ext-mbstring For best performance
+ [1] => ext-libsodium Provides a modern crypto API that can be used to generate random bytes.
+ [2] => ext-mbstring For best performance
)
)
++++++ licenses.txt ++++++
--- /var/tmp/diff_new_pack.ydfMhf/_old 2017-12-29 18:52:46.172844477 +0100
+++ /var/tmp/diff_new_pack.ydfMhf/_new 2017-12-29 18:52:46.176843329 +0100
@@ -15,6 +15,7 @@
guzzlehttp/streams 3.0.0 MIT
padraic/humbug_get_contents 1.0.4 BSD-3-Clause
padraic/phar-updater 1.0.4 BSD-3-Clause
+paragonie/random_compat v2.0.11 MIT
platformsh/client v0.14.0 MIT
platformsh/console-form v0.0.15 MIT
psr/container 1.0.0 MIT
++++++ platformsh-cli-3.26.0.tar.xz -> platformsh-cli-3.26.1.tar.xz ++++++
++++ 1688 lines of diff (skipped)
++++++ platformsh-cli-vendor.tar.xz ++++++
++++ 1630 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package orion for openSUSE:Factory checked in at 2017-12-29 18:52:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/orion (Old)
and /work/SRC/openSUSE:Factory/.orion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orion"
Fri Dec 29 18:52:25 2017 rev:14 rq:560448 version:1.6.1+git~20171212
Changes:
--------
--- /work/SRC/…
[View More]openSUSE:Factory/orion/orion.changes 2017-11-07 09:59:49.258334556 +0100
+++ /work/SRC/openSUSE:Factory/.orion.new/orion.changes 2017-12-29 18:52:39.006902601 +0100
@@ -1,0 +2,6 @@
+Thu Dec 21 20:53:46 UTC 2017 - pousaduarte(a)gmail.com
+
+- Update to version 1.6.1+git~20171212:
+ * add keep on top option for desktop
+
+-------------------------------------------------------------------
Old:
----
orion-1.6.1+git~20171029.tar.xz
New:
----
orion-1.6.1+git~20171212.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ orion.spec ++++++
--- /var/tmp/diff_new_pack.EybnXu/_old 2017-12-29 18:52:40.882363951 +0100
+++ /var/tmp/diff_new_pack.EybnXu/_new 2017-12-29 18:52:40.886362802 +0100
@@ -17,7 +17,7 @@
Name: orion
-Version: 1.6.1+git~20171029
+Version: 1.6.1+git~20171212
Release: 0
Summary: Twitch stream client using Qt
License: GPL-3.0
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.EybnXu/_old 2017-12-29 18:52:40.974337535 +0100
+++ /var/tmp/diff_new_pack.EybnXu/_new 2017-12-29 18:52:40.974337535 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/alamminsalo/orion.git</param>
- <param name="changesrevision">7f604661b3e94b09d1b6d13860606bc6fbd59f0f</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">ed4c051a969b0e9857f1a2c2f060bcdb8f748d4a</param></service></servicedata>
\ No newline at end of file
++++++ orion-1.6.1+git~20171029.tar.xz -> orion-1.6.1+git~20171212.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.6.1+git~20171029/src/model/settingsmanager.cpp new/orion-1.6.1+git~20171212/src/model/settingsmanager.cpp
--- old/orion-1.6.1+git~20171029/src/model/settingsmanager.cpp 2017-10-29 20:07:42.000000000 +0100
+++ new/orion-1.6.1+git~20171212/src/model/settingsmanager.cpp 2017-12-12 20:13:26.000000000 +0100
@@ -22,6 +22,7 @@
mChatEdge = 1;
mLightTheme = false;
mFont = "";
+ mKeepOnTop = false;
//Connections
connect(HttpServer::getInstance(), &HttpServer::codeReceived, this, &SettingsManager::setAccessToken);
@@ -84,6 +85,10 @@
if (settings->contains("font")) {
setFont(settings->value("font").toString());
}
+
+ if (settings->contains("keepOnTop")) {
+ setKeepOnTop(settings->value("keepOnTop").toBool());
+ }
}
bool SettingsManager::alert() const
@@ -332,3 +337,17 @@
return false;
#endif
}
+
+bool SettingsManager::keepOnTop() const
+{
+ return mKeepOnTop;
+}
+
+void SettingsManager::setKeepOnTop(bool keepOnTop)
+{
+ if (mKeepOnTop != keepOnTop) {
+ mKeepOnTop = keepOnTop;
+ settings->setValue("keepOnTop", keepOnTop);
+ }
+ emit keepOnTopChanged();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.6.1+git~20171029/src/model/settingsmanager.h new/orion-1.6.1+git~20171212/src/model/settingsmanager.h
--- old/orion-1.6.1+git~20171029/src/model/settingsmanager.h 2017-10-29 20:07:42.000000000 +0100
+++ new/orion-1.6.1+git~20171212/src/model/settingsmanager.h 2017-12-12 20:13:26.000000000 +0100
@@ -24,6 +24,7 @@
Q_PROPERTY(bool lightTheme READ lightTheme WRITE setLightTheme NOTIFY lightThemeChanged)
Q_PROPERTY(QString font READ font WRITE setFont NOTIFY fontChanged)
Q_PROPERTY(bool versionCheckEnabled READ versionCheckEnabled)
+ Q_PROPERTY(bool keepOnTop READ keepOnTop WRITE setKeepOnTop NOTIFY keepOnTopChanged)
bool mAlert;
bool mCloseToTray;
@@ -40,6 +41,7 @@
QString mFont;
bool mHiDpi;
+ bool mKeepOnTop;
explicit SettingsManager(QObject *parent = nullptr);
static SettingsManager *instance;
@@ -85,6 +87,9 @@
bool versionCheckEnabled();
+ bool keepOnTop() const;
+ void setKeepOnTop(bool keepOnTop);
+
signals:
void alertChanged();
void closeToTrayChanged();
@@ -98,6 +103,7 @@
void lightThemeChanged();
void accessTokenChanged(QString accessToken);
void fontChanged();
+ void keepOnTopChanged();
public slots:
void setAccessToken(const QString accessToken);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.6.1+git~20171029/src/qml/OptionsView.qml new/orion-1.6.1+git~20171212/src/qml/OptionsView.qml
--- old/orion-1.6.1+git~20171029/src/qml/OptionsView.qml 2017-10-29 20:07:42.000000000 +0100
+++ new/orion-1.6.1+git~20171212/src/qml/OptionsView.qml 2017-12-12 20:13:26.000000000 +0100
@@ -169,6 +169,14 @@
selection: Settings.chatEdge
onActivated: Settings.chatEdge = index
}
+
+ Switch {
+ visible: !isMobile()
+ id: keepOnTopOption
+ text: "Keep on top"
+ checked: Settings.keepOnTop
+ onClicked: Settings.keepOnTop = checked
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.6.1+git~20171029/src/qml/main.qml new/orion-1.6.1+git~20171212/src/qml/main.qml
--- old/orion-1.6.1+git~20171029/src/qml/main.qml 2017-10-29 20:07:42.000000000 +0100
+++ new/orion-1.6.1+git~20171212/src/qml/main.qml 2017-12-12 20:13:26.000000000 +0100
@@ -129,6 +129,10 @@
}
});
}
+
+ if (Settings.keepOnTop){
+ root.flags |= Qt.WindowStaysOnTopHint;
+ }
}
Dialog {
@@ -167,5 +171,16 @@
active: !isMobile()
sourceComponent: AppTray{}
}
+
+ Connections{
+ target: Settings
+ onKeepOnTopChanged:{
+ if (Settings.keepOnTop){
+ root.flags |= Qt.WindowStaysOnTopHint;
+ }else{
+ root.flags &= ~Qt.WindowStaysOnTopHint;
+ }
+ }
+ }
}
[View Less]
1
0
Hello community,
here is the log from the commit of package tilix for openSUSE:Factory checked in at 2017-12-29 18:52:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tilix (Old)
and /work/SRC/openSUSE:Factory/.tilix.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tilix"
Fri Dec 29 18:52:22 2017 rev:2 rq:560441 version:1.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/…
[View More]tilix/tilix.changes 2017-11-27 22:15:35.284782873 +0100
+++ /work/SRC/openSUSE:Factory/.tilix.new/tilix.changes 2017-12-29 18:52:35.751837484 +0100
@@ -1,0 +2,10 @@
+Thu Dec 21 19:28:29 UTC 2017 - mimi.vx(a)gmail.com
+
+- remove unnneded post/postun sections
+
+-------------------------------------------------------------------
+Fri Dec 1 22:16:16 UTC 2017 - matthias.eliasson(a)gmail.com
+
+- Fix so tilix runs correctly
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tilix.spec ++++++
--- /var/tmp/diff_new_pack.QiyM9K/_old 2017-12-29 18:52:36.387654872 +0100
+++ /var/tmp/diff_new_pack.QiyM9K/_new 2017-12-29 18:52:36.387654872 +0100
@@ -23,7 +23,7 @@
Summary: A tiling terminal emulator based on GTK+ 3
License: MPL-2.0
Group: System/X11/Terminals
-URL: https://github.com/gnunn1/tilix
+Url: https://github.com/gnunn1/tilix
Source0: https://github.com/gnunn1/tilix/archive/%{version}.tar.gz#/%{name}-%{versio…
# See https://github.com/dlang/dub/issues/838 on why we need to have the full source code as dependency
Source1: https://github.com/gtkd-developers/GtkD/archive/v%{gtkd_version}.tar.gz#/Gt…
@@ -82,23 +82,15 @@
%find_lang %{name} %{?no_lang_C}
-%post
-%desktop_database_post
-%icon_theme_cache_post
-%glib2_gsettings_schema_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-%glib2_gsettings_schema_postun
-
%files
%doc LICENSE README.md
%{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/%{name}/schemes/
%{_datadir}/%{name}/resources/
+%{_datadir}/%{name}/resources/tilix.gresource
+%{_datadir}/%{name}/schemes/
%{_datadir}/%{name}/scripts/
+%{_datadir}/%{name}/scripts/tilix_int.sh
%{_mandir}/man1/tilix.1%{ext_man}
%{_datadir}/metainfo/
%{_datadir}/metainfo/com.gexperts.Tilix.appdata.xml
[View Less]
1
0
Hello community,
here is the log from the commit of package libjaylink for openSUSE:Factory checked in at 2017-12-29 18:52:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libjaylink (Old)
and /work/SRC/openSUSE:Factory/.libjaylink.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjaylink"
Fri Dec 29 18:52:17 2017 rev:5 rq:560440 version:0.1.0
Changes:
--------
--- /work/SRC/…
[View More]openSUSE:Factory/libjaylink/libjaylink.changes 2016-12-13 19:33:31.317425092 +0100
+++ /work/SRC/openSUSE:Factory/.libjaylink.new/libjaylink.changes 2017-12-29 18:52:32.712710348 +0100
@@ -1,0 +2,5 @@
+Thu Dec 28 19:42:45 UTC 2017 - afaerber(a)suse.de
+
+- Update to 0.1.0 tag
+
+-------------------------------------------------------------------
Old:
----
libjaylink-0.1.0~git.20161208.tar.xz
New:
----
libjaylink-0.1.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libjaylink.spec ++++++
--- /var/tmp/diff_new_pack.TLW4Lb/_old 2017-12-29 18:52:33.312538073 +0100
+++ /var/tmp/diff_new_pack.TLW4Lb/_new 2017-12-29 18:52:33.320535776 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libjaylink
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libjaylink
-Version: 0.1.0~git.20161208
+Version: 0.1.0
Release: 0
Url: http://git.zapb.de/libjaylink.git
Summary: USB interface library for J-Link
++++++ _service ++++++
--- /var/tmp/diff_new_pack.TLW4Lb/_old 2017-12-29 18:52:33.384517400 +0100
+++ /var/tmp/diff_new_pack.TLW4Lb/_new 2017-12-29 18:52:33.388516251 +0100
@@ -3,8 +3,9 @@
<param name="scm">git</param>
<param name="url">git://repo.or.cz/libjaylink.git</param>
<param name="filename">libjaylink</param>
- <param name="versionformat">0.1.0~git.%cd</param>
- <param name="revision">master</param>
+ <!--param name="versionformat">0.1.0~git.%cd</param-->
+ <param name="versionformat">0.1.0</param>
+ <param name="revision">0.1.0</param>
</service>
<service name="tar" mode="disabled"/>
<service name="recompress" mode="disabled">
++++++ libjaylink-0.1.0~git.20161208.tar.xz -> libjaylink-0.1.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjaylink-0.1.0~git.20161208/NEWS new/libjaylink-0.1.0/NEWS
--- old/libjaylink-0.1.0~git.20161208/NEWS 2016-12-08 20:04:51.000000000 +0100
+++ new/libjaylink-0.1.0/NEWS 2016-12-28 18:15:53.000000000 +0100
@@ -1,7 +1,7 @@
News
====
-0.1.0 (2016-mm-dd)
+0.1.0 (2016-12-28)
------------------
* Initial release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libjaylink-0.1.0~git.20161208/libjaylink/discovery.c new/libjaylink-0.1.0/libjaylink/discovery.c
--- old/libjaylink-0.1.0~git.20161208/libjaylink/discovery.c 2016-12-08 20:04:51.000000000 +0100
+++ new/libjaylink-0.1.0/libjaylink/discovery.c 2016-12-28 18:15:53.000000000 +0100
@@ -192,6 +192,7 @@
return NULL;
}
+ serial_number = 0;
valid_serial_number = true;
ret = libusb_get_string_descriptor_ascii(usb_devh, desc.iSerialNumber,
[View Less]
1
0
Hello community,
here is the log from the commit of package smplayer for openSUSE:Factory checked in at 2017-12-29 18:52:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smplayer (Old)
and /work/SRC/openSUSE:Factory/.smplayer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smplayer"
Fri Dec 29 18:52:13 2017 rev:26 rq:560423 version:17.12.0
Changes:
--------
--- /work/SRC/…
[View More]openSUSE:Factory/smplayer/smplayer.changes 2017-12-19 10:58:48.372427192 +0100
+++ /work/SRC/openSUSE:Factory/.smplayer.new/smplayer.changes 2017-12-29 18:52:26.654450334 +0100
@@ -1,0 +2,17 @@
+Thu Dec 28 15:45:54 UTC 2017 - avindra(a)opensuse.org
+
+- Update to version 17.12.0:
+ * Two new actions to take screenshots with or without subtitles
+ (they only work when using mpv). Assigned by default to
+ Ctrl+Shift+S and Ctrl+Alt+S.
+ * New action which displays the filename in the OSD for 2
+ seconds. Assigned by default to Shift+O.
+ * New option osd_bar_pos for smplayer.ini. It specifies the
+ position of the OSD bar (0 = top, 100 = bottom).
+ * Support for DVD menus removed. mpv already removed support
+ for it a long time ago.
+ * Option to open an informative page after an upgrade has
+ been removed.
+ * SMPlayer works again on Windows XP (32 bit packages only)
+
+-------------------------------------------------------------------
Old:
----
smplayer-17.11.2.tar.bz2
New:
----
smplayer-17.12.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smplayer.spec ++++++
--- /var/tmp/diff_new_pack.Ge8uC9/_old 2017-12-29 18:52:27.374243603 +0100
+++ /var/tmp/diff_new_pack.Ge8uC9/_new 2017-12-29 18:52:27.378242454 +0100
@@ -17,7 +17,7 @@
Name: smplayer
-Version: 17.11.2
+Version: 17.12.0
Release: 0
Summary: Complete frontend for MPV
License: GPL-2.0+
++++++ smplayer-17.11.2.tar.bz2 -> smplayer-17.12.0.tar.bz2 ++++++
++++ 133319 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package drbd-utils for openSUSE:Factory checked in at 2017-12-29 18:52:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
and /work/SRC/openSUSE:Factory/.drbd-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils"
Fri Dec 29 18:52:09 2017 rev:19 rq:560269 version:9.2.0
Changes:
--------
--- /work/…
[View More]SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes 2017-10-17 01:53:35.931396969 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes 2017-12-29 18:52:22.095759630 +0100
@@ -1,0 +2,13 @@
+Wed Dec 6 07:19:50 UTC 2017 - nwang(a)suse.com
+
+- bsc#1074169, Update to 9.2.0
+ * Japanese man pages
+ * initial vertias cluster agent support
+ * quorum integration (including agents)
+ * improve drbd9 (mesh)/drbd-proxy integration
+ * pull fixups from 9.1.1 branch
+ * switch to github
+ * drbdmon: page naviagation
+ * debian: add mount as dependency
+
+-------------------------------------------------------------------
@@ -7,0 +21,18 @@
+
+-------------------------------------------------------------------
+Fri Sep 1 08:13:38 UTC 2017 - nwang(a)suse.com
+
+- Update to 9.1.0
+ * allow events2 --now polling
+ * fix ambiguous inheritance for peer-device-options
+ * fixup fallback path for BLKZEROOUT for older kernels
+ * fix v9 proxy support
+ * modernized XEN scripts
+ * reproducible builds support
+ * create-md --force for v8.4 (for compat to v9)
+ * fix cstate output
+ * resize: give resize more time (same as attach)
+ * drbdmon: peer-device status, version info, node name
+ * "drbdadm status" for v8.4
+ * set peer-device-options only once
+- Remove Update-block-drbd-script-to-support-xen.patch
Old:
----
Update-block-drbd-script-to-support-xen.patch
drbd-utils-9.0.0.tar.gz
New:
----
drbd-utils-9.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ drbd-utils.spec ++++++
--- /var/tmp/diff_new_pack.Fg78hu/_old 2017-12-29 18:52:22.987503513 +0100
+++ /var/tmp/diff_new_pack.Fg78hu/_new 2017-12-29 18:52:22.991502365 +0100
@@ -19,7 +19,7 @@
%bcond_without drbdmon
Name: drbd-utils
-Version: 9.0.0
+Version: 9.2.0
Release: 0
Summary: Distributed Replicated Block Device
License: GPL-2.0+
@@ -35,9 +35,8 @@
# PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
Patch6: fix_call_khelper_with_stack.patch
-Patch7: Update-block-drbd-script-to-support-xen.patch
-Patch8: move_fencing_from_disk_to_net_in_example.patch
-Patch9: skip_sh-b-pri_in_v9.patch
+Patch7: move_fencing_from_disk_to_net_in_example.patch
+Patch8: skip_sh-b-pri_in_v9.patch
Provides: drbd-bash-completion = %{version}
Provides: drbd-pacemaker = %{version}
@@ -79,7 +78,7 @@
raid 1. It is a building block for setting up clusters.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -88,7 +87,6 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%build
./autogen.sh
@@ -143,8 +141,10 @@
%{_tmpfilesdir}/drbd.conf
%doc %{_mandir}/man5/drbd.*
%doc %{_mandir}/man8/drbd*
+%doc %{_mandir}/ja/man5/drbd.*
+%doc %{_mandir}/ja/man8/drbd*
%doc COPYING
-%doc README
+%doc README.md
%doc ChangeLog
%doc scripts/drbd.conf.example
%dir %{_sysconfdir}/drbd.d
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Fg78hu/_old 2017-12-29 18:52:23.035489731 +0100
+++ /var/tmp/diff_new_pack.Fg78hu/_new 2017-12-29 18:52:23.039488583 +0100
@@ -1,13 +1,14 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="url">git://git.linbit.com/drbd-utils.git</param>
+ <param name="url">https://github.com/LINBIT/drbd-utils.git</param>
<param name="scm">git</param>
<param name="filename">drbd-utils</param>
<!--
build service using release drbd-utils atm.
- <param name="version">9.0.0</param>
+ <param name="version">9.2.0</param>
+ Using release tarball instead of git since need buildtag.c/h
-->
- <param name="versionformat">9.0.0+git.%h</param>
+ <param name="versionformat">9.2.0+git.%h</param>
<param name="revision">master</param>
</service>
++++++ drbd-utils-9.0.0.tar.gz -> drbd-utils-9.2.0.tar.gz ++++++
++++ 13297 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package sway for openSUSE:Factory checked in at 2017-12-29 18:52:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sway (Old)
and /work/SRC/openSUSE:Factory/.sway.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sway"
Fri Dec 29 18:52:06 2017 rev:12 rq:560253 version:0.15.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/sway/…
[View More]sway.changes 2017-12-14 10:56:45.269725564 +0100
+++ /work/SRC/openSUSE:Factory/.sway.new/sway.changes 2017-12-29 18:52:17.777000015 +0100
@@ -1,0 +2,16 @@
+Thu Dec 28 05:09:52 UTC 2017 - avindra(a)opensuse.org
+
+- bump to 0.15.1
+ - Update to json-c 0.13
+ - Documentation corrections
+ - Portability fixes
+ - Output scale now preserved upon reloads/hotplugs
+ - Closing fullscreen windows in nested containers no longer
+ crashes
+ - swaygrab more gracefully handles errors
+ - Fixes to some minor tray issues
+ - Fix security grants for swaylock -f
+ - Clear password buffer after checking it in swaylock
+- partial cleanup with spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
sway-0.15.0.tar.gz
sway-0.15.0.tar.gz.sig
New:
----
sway-0.15.1.tar.gz
sway-0.15.1.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sway.spec ++++++
--- /var/tmp/diff_new_pack.535LKk/_old 2017-12-29 18:52:18.620757680 +0100
+++ /var/tmp/diff_new_pack.535LKk/_new 2017-12-29 18:52:18.620757680 +0100
@@ -16,7 +16,7 @@
#
-%define basever 0.15.0
+%define basever 0.15.1
#%define prerelease rc1
%if 0%{?prerelease:0}
@@ -83,7 +83,6 @@
%cmake_install
%files
-%defattr(-,root,root)
%doc LICENSE README.md CONTRIBUTING.md
%{_bindir}/%{name}*
%dir %{_sysconfdir}/sway
++++++ sway-0.15.0.tar.gz -> sway-0.15.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/CMakeLists.txt new/sway-0.15.1/CMakeLists.txt
--- old/sway-0.15.0/CMakeLists.txt 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/CMakeLists.txt 2017-12-17 21:53:22.000000000 +0100
@@ -48,7 +48,7 @@
add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}")
endif()
-find_package(JsonC 0.12.1 REQUIRED)
+find_package(JsonC REQUIRED)
find_package(PCRE REQUIRED)
find_package(WLC REQUIRED)
find_package(Wayland REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.de.md new/sway-0.15.1/README.de.md
--- old/sway-0.15.0/README.de.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.de.md 2017-12-17 21:53:22.000000000 +0100
@@ -60,7 +60,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.el.md new/sway-0.15.1/README.el.md
--- old/sway-0.15.0/README.el.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.el.md 2017-12-17 21:53:22.000000000 +0100
@@ -53,7 +53,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.fr.md new/sway-0.15.1/README.fr.md
--- old/sway-0.15.0/README.fr.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.fr.md 2017-12-17 21:53:22.000000000 +0100
@@ -55,7 +55,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.it.md new/sway-0.15.1/README.it.md
--- old/sway-0.15.0/README.it.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.it.md 2017-12-17 21:53:22.000000000 +0100
@@ -56,7 +56,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.ja.md new/sway-0.15.1/README.ja.md
--- old/sway-0.15.0/README.ja.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.ja.md 2017-12-17 21:53:22.000000000 +0100
@@ -46,7 +46,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.md new/sway-0.15.1/README.md
--- old/sway-0.15.0/README.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.md 2017-12-17 21:53:22.000000000 +0100
@@ -61,7 +61,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.pt.md new/sway-0.15.1/README.pt.md
--- old/sway-0.15.0/README.pt.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.pt.md 2017-12-17 21:53:22.000000000 +0100
@@ -62,7 +62,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.ru.md new/sway-0.15.1/README.ru.md
--- old/sway-0.15.0/README.ru.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.ru.md 2017-12-17 21:53:22.000000000 +0100
@@ -55,7 +55,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/README.uk.md new/sway-0.15.1/README.uk.md
--- old/sway-0.15.0/README.uk.md 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/README.uk.md 2017-12-17 21:53:22.000000000 +0100
@@ -62,7 +62,7 @@
* libcap
* asciidoc
* pcre
-* json-c <= 0.12.1
+* json-c
* pango
* cairo
* gdk-pixbuf2 *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/include/sway_json_helper.h new/sway-0.15.1/include/sway_json_helper.h
--- old/sway-0.15.0/include/sway_json_helper.h 1970-01-01 01:00:00.000000000 +0100
+++ new/sway-0.15.1/include/sway_json_helper.h 2017-12-17 21:53:22.000000000 +0100
@@ -0,0 +1,16 @@
+#ifndef _SWAY_JSON_HELPER_H
+#define _SWAY_JSON_HELPER_H
+
+#include <json-c/json.h>
+
+// Macros for checking a specific version.
+#define JSON_C_VERSION_013 (13 << 8)
+
+// json-c v0.13 uses size_t for array_list_length().
+#if defined(JSON_C_VERSION_NUM) && JSON_C_VERSION_NUM >= JSON_C_VERSION_013
+typedef size_t json_ar_len_t;
+#else
+typedef int json_ar_len_t;
+#endif
+
+#endif // _SWAY_JSON_HELPER_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/include/swaygrab/json.h new/sway-0.15.1/include/swaygrab/json.h
--- old/sway-0.15.0/include/swaygrab/json.h 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/include/swaygrab/json.h 2017-12-17 21:53:22.000000000 +0100
@@ -1,4 +1,4 @@
-#include <json-c/json.h>
+#include "sway_json_helper.h"
#include "wlc/wlc.h"
void init_json_tree(int socketfd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/sway/ipc-server.c new/sway-0.15.1/sway/ipc-server.c
--- old/sway-0.15.0/sway/ipc-server.c 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/sway/ipc-server.c 2017-12-17 21:53:22.000000000 +0100
@@ -15,7 +15,6 @@
#include <stdlib.h>
#include <sys/ioctl.h>
#include <fcntl.h>
-#include <json-c/json.h>
#include <list.h>
#include <libinput.h>
#ifdef __linux__
@@ -25,6 +24,7 @@
gid_t gid;
};
#endif
+#include "sway_json_helper.h"
#include "sway/ipc-json.h"
#include "sway/ipc-server.h"
#include "sway/security.h"
@@ -724,7 +724,7 @@
}
// parse requested event types
- for (int i = 0; i < json_object_array_length(request); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(request); i++) {
const char *event_type = json_object_get_string(json_object_array_get_idx(request, i));
if (strcmp(event_type, "workspace") == 0) {
client->subscribed_events |= event_mask(IPC_EVENT_WORKSPACE);
@@ -1126,7 +1126,8 @@
sway_log(L_DEBUG, "Sending binding::run event");
json_object *obj = json_object_new_object();
json_object_object_add(obj, "change", json_object_new_string("run"));
- json_object_object_add(obj, "binding", sb_obj);
+ // sb_obj gets owned by the temporary json_object, too.
+ json_object_object_add(obj, "binding", json_object_get(sb_obj));
const char *json_string = json_object_to_json_string(obj);
ipc_send_event(json_string, IPC_EVENT_BINDING);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/swaybar/status_line.c new/sway-0.15.1/swaybar/status_line.c
--- old/sway-0.15.0/swaybar/status_line.c 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/swaybar/status_line.c 2017-12-17 21:53:22.000000000 +0100
@@ -2,8 +2,8 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <json-c/json.h>
+#include "sway_json_helper.h"
#include "swaybar/config.h"
#include "swaybar/status_line.h"
#include "log.h"
@@ -70,8 +70,7 @@
bar->status->block_line = create_list();
- int i;
- for (i = 0; i < json_object_array_length(results); ++i) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(results); ++i) {
json_object *full_text, *short_text, *color, *min_width, *align, *urgent;
json_object *name, *instance, *separator, *separator_block_width;
json_object *background, *border, *border_top, *border_bottom;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/swaygrab/json.c new/sway-0.15.1/swaygrab/json.c
--- old/sway-0.15.0/swaygrab/json.c 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/swaygrab/json.c 2017-12-17 21:53:22.000000000 +0100
@@ -50,8 +50,7 @@
} else {
json_object *nodes, *node, *child;
json_object_object_get_ex(c, "nodes", &nodes);
- int i;
- for (i = 0; i < json_object_array_length(nodes); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) {
node = json_object_array_get_idx(nodes, i);
if ((child = get_focused_container_r(node))) {
@@ -60,7 +59,7 @@
}
json_object_object_get_ex(c, "floating_nodes", &nodes);
- for (i = 0; i < json_object_array_length(nodes); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) {
node = json_object_array_get_idx(nodes, i);
if ((child = get_focused_container_r(node))) {
@@ -83,7 +82,7 @@
if (!outputs) {
sway_abort("Unabled to get focused output. No nodes in tree.");
}
- for (int i = 0; i < json_object_array_length(outputs); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) {
output = json_object_array_get_idx(outputs, i);
if (get_focused_container_r(output)) {
@@ -131,7 +130,7 @@
json_object *outputs, *json_output, *name;
json_object_object_get_ex(tree, "nodes", &outputs);
- for (int i = 0; i < json_object_array_length(outputs); i++) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) {
json_output = json_object_array_get_idx(outputs, i);
json_object_object_get_ex(json_output, "name", &name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/swaylock/main.c new/sway-0.15.1/swaylock/main.c
--- old/sway-0.15.0/swaylock/main.c 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/swaylock/main.c 2017-12-17 21:53:22.000000000 +0100
@@ -3,16 +3,17 @@
#include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-names.h>
#include <security/pam_appl.h>
-#include <json-c/json.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/mman.h>
#include <sys/types.h>
#include <pwd.h>
#include <getopt.h>
#include <signal.h>
#include <stdbool.h>
#include <unistd.h>
+#include "sway_json_helper.h"
#include "client/window.h"
#include "client/registry.h"
#include "client/cairo.h"
@@ -56,8 +57,7 @@
exit(exit_code);
}
-char *password;
-int password_size;
+char password[1024];
enum line_source line_source = LINE_SOURCE_DEFAULT;
struct lock_config *init_config() {
@@ -115,7 +115,7 @@
switch (msg[i]->msg_style) {
case PAM_PROMPT_ECHO_OFF:
case PAM_PROMPT_ECHO_ON:
- pam_reply[i].resp = password;
+ pam_reply[i].resp = strdup(password); // PAM clears and frees this
break;
case PAM_ERROR_MSG:
@@ -127,9 +127,15 @@
return PAM_SUCCESS;
}
-/**
- * Note: PAM will free() 'password' during the process
- */
+void clear_password_buffer() {
+ // Use volatile keyword so so compiler can't optimize this out.
+ volatile char *pw = password;
+ volatile char zero = '\0';
+ for (size_t i = 0; i < sizeof(password); ++i) {
+ pw[i] = zero;
+ }
+}
+
bool verify_password() {
struct passwd *passwd = getpwuid(getuid());
char *username = passwd->pw_name;
@@ -151,8 +157,7 @@
void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t code, uint32_t codepoint) {
int redraw_screen = 0;
- char *password_realloc;
- int i;
+ size_t i;
if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
switch (sym) {
@@ -165,14 +170,14 @@
wl_dispatch_events();
if (verify_password()) {
+ clear_password_buffer();
exit(0);
}
render_data.auth_state = AUTH_STATE_INVALID;
redraw_screen = 1;
- password_size = 1024;
- password = malloc(password_size);
+ clear_password_buffer();
password[0] = '\0';
break;
case XKB_KEY_BackSpace:
@@ -207,9 +212,7 @@
render_data.auth_state = AUTH_STATE_BACKSPACE;
redraw_screen = 1;
- password_size = 1024;
- free(password);
- password = malloc(password_size);
+ clear_password_buffer();
password[0] = '\0';
break;
}
@@ -218,22 +221,10 @@
render_data.auth_state = AUTH_STATE_INPUT;
redraw_screen = 1;
i = strlen(password);
- if (i + 1 == password_size) {
- password_size += 1024;
- password_realloc = realloc(password, password_size);
- // reset password if realloc fails.
- if (password_realloc == NULL) {
- password_size = 1024;
- free(password);
- password = malloc(password_size);
- password[0] = '\0';
- break;
- } else {
- password = password_realloc;
- }
+ if (i + 1 < sizeof(password)) {
+ password[i] = (char)codepoint;
+ password[i + 1] = '\0';
}
- password[i] = (char)codepoint;
- password[i + 1] = '\0';
break;
}
if (redraw_screen) {
@@ -343,6 +334,7 @@
int main(int argc, char **argv) {
const char *scaling_mode_str = "fit", *socket_path = NULL;
+ char *image_path = NULL;
int i;
void *images = NULL;
config = init_config();
@@ -400,8 +392,6 @@
" For more information see `man swaylock`\n";
- registry = registry_poll();
-
int c;
while (1) {
int option_index = 0;
@@ -418,29 +408,7 @@
}
case 'i':
{
- char *image_path = strchr(optarg, ':');
- if (image_path == NULL) {
- if (render_data.num_images == 0) {
- // Provided image without output
- render_data.image = load_image(optarg);
- render_data.num_images = -1;
- } else {
- sway_log(L_ERROR, "output must be defined for all --images or no --images");
- exit(EXIT_FAILURE);
- }
- } else {
- // Provided image for all outputs
- if (render_data.num_images == 0) {
- images = calloc(registry->outputs->length, sizeof(char*) * 2);
- } else if (render_data.num_images == -1) {
- sway_log(L_ERROR, "output must be defined for all --images or no --images");
- exit(EXIT_FAILURE);
- }
-
- image_path[0] = '\0';
- ((char**) images)[render_data.num_images * 2] = optarg;
- ((char**) images)[render_data.num_images++ * 2 + 1] = ++image_path;
- }
+ image_path = optarg;
break;
}
case 't':
@@ -519,6 +487,33 @@
exit(EXIT_FAILURE);
}
}
+ registry = registry_poll();
+
+ if (image_path) {
+ char *path = strchr(image_path, ':');
+ if (path == NULL) {
+ if (render_data.num_images == 0) {
+ // Provided image without output
+ render_data.image = load_image(image_path);
+ render_data.num_images = -1;
+ } else {
+ sway_log(L_ERROR, "output must be defined for all --images or no --images");
+ exit(EXIT_FAILURE);
+ }
+ } else {
+ // Provided image for all outputs
+ if (render_data.num_images == 0) {
+ images = calloc(registry->outputs->length, sizeof(char*) * 2);
+ } else if (render_data.num_images == -1) {
+ sway_log(L_ERROR, "output must be defined for all --images or no --images");
+ exit(EXIT_FAILURE);
+ }
+
+ path[0] = '\0';
+ ((char**) images)[render_data.num_images * 2] = image_path;
+ ((char**) images)[render_data.num_images++ * 2 + 1] = ++path;
+ }
+ }
render_data.scaling_mode = SCALING_MODE_STRETCH;
if (strcmp(scaling_mode_str, "stretch") == 0) {
@@ -535,8 +530,12 @@
sway_abort("Unsupported scaling mode: %s", scaling_mode_str);
}
- password_size = 1024;
- password = malloc(password_size);
+#ifdef __linux__
+ // Most non-linux platforms require root to mlock()
+ if (mlock(password, sizeof(password)) != 0) {
+ sway_abort("Unable to mlock() password memory.");
+ }
+#endif
password[0] = '\0';
render_data.surfaces = create_list();
if (!socket_path) {
@@ -584,7 +583,7 @@
for (i = 0; i < registry->outputs->length; ++i) {
if (displays_paths[i * 2] != NULL) {
- for (int j = 0;; ++j) {
+ for (json_ar_len_t j = 0;; ++j) {
if (j >= json_object_array_length(json_outputs)) {
sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]);
exit(EXIT_FAILURE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sway-0.15.0/swaymsg/main.c new/sway-0.15.1/swaymsg/main.c
--- old/sway-0.15.0/swaymsg/main.c 2017-11-07 00:16:22.000000000 +0100
+++ new/sway-0.15.1/swaymsg/main.c 2017-12-17 21:53:22.000000000 +0100
@@ -9,7 +9,7 @@
#include <sys/socket.h>
#include <ctype.h>
#include <unistd.h>
-#include <json-c/json.h>
+#include "sway_json_helper.h"
#include "stringop.h"
#include "ipc-client.h"
#include "readline.h"
@@ -149,7 +149,7 @@
static void pretty_print_clipboard(json_object *v) {
if (success(v, true)) {
if (json_object_is_type(v, json_type_array)) {
- for (int i = 0; i < json_object_array_length(v); ++i) {
+ for (json_ar_len_t i = 0; i < json_object_array_length(v); ++i) {
json_object *o = json_object_array_get_idx(v, i);
printf("%s\n", json_object_get_string(o));
}
[View Less]
1
0
Hello community,
here is the log from the commit of package libosmo-sccp for openSUSE:Factory checked in at 2017-12-29 18:52:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libosmo-sccp (Old)
and /work/SRC/openSUSE:Factory/.libosmo-sccp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmo-sccp"
Fri Dec 29 18:52:02 2017 rev:6 rq:560210 version:0.8.1
Changes:
--------
--- /…
[View More]work/SRC/openSUSE:Factory/libosmo-sccp/libosmo-sccp.changes 2017-10-27 14:01:16.820412891 +0200
+++ /work/SRC/openSUSE:Factory/.libosmo-sccp.new/libosmo-sccp.changes 2017-12-29 18:52:11.326852552 +0100
@@ -1,0 +2,7 @@
+Thu Dec 28 00:32:03 UTC 2017 - jengelh(a)inai.de
+
+- Update to new upstream release 0.8.1
+ * sccp_scrc: fix Network Indicator in SIO composition
+ * osmo_sccp_addr_encode(): Fix truncation of point codes
+
+-------------------------------------------------------------------
Old:
----
libosmo-sccp-0.7.0.284.tar.xz
New:
----
libosmo-sccp-0.8.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libosmo-sccp.spec ++++++
--- /var/tmp/diff_new_pack.TV9Rb3/_old 2017-12-29 18:52:12.158613664 +0100
+++ /var/tmp/diff_new_pack.TV9Rb3/_new 2017-12-29 18:52:12.158613664 +0100
@@ -17,9 +17,9 @@
Name: libosmo-sccp
-Version: 0.7.0.284
+Version: 0.8.1
Release: 0
-%define libversion 0_7_0_284
+%define libversion 0_8_1
Summary: Osmocom library for the A-bis interface between BTS and BSC
License: AGPL-3.0+ and GPL-2.0+
Group: Hardware/Mobile
@@ -34,10 +34,10 @@
BuildRequires: lksctp-tools-devel
BuildRequires: pkg-config >= 0.20
BuildRequires: xz
-BuildRequires: pkgconfig(libosmo-netif) >= 0.0.6.1
-BuildRequires: pkgconfig(libosmocore) >= 0.9.0.45
-BuildRequires: pkgconfig(libosmogsm) >= 0.9.5
-BuildRequires: pkgconfig(libosmovty) >= 0.3.0
+BuildRequires: pkgconfig(libosmo-netif) >= 0.1.0
+BuildRequires: pkgconfig(libosmocore) >= 0.10.0
+BuildRequires: pkgconfig(libosmogsm) >= 0.10.0
+BuildRequires: pkgconfig(libosmovty) >= 0.10.0
%description
SCCP is a network layer protocol that provides extended routing, flow
@@ -49,12 +49,6 @@
Summary: Osmocom Message Transfer Part library
License: GPL-2.0+
Group: System/Libraries
-%if "%version" == "0.7.0.284"
-# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208
-# in order to have proper upgrade paths, we need to obsolete the old/wrong
-# package name
-Obsoletes: libosmo-mtp-0_7_0_208
-%endif
%description -n libosmo-mtp-%libversion
The Message Transfer Part (MTP) is part of the Signaling System 7
@@ -79,12 +73,6 @@
Summary: Osmocom Signalling Connection Control Part library
License: GPL-2.0+
Group: System/Libraries
-%if "%version" == "0.7.0.284"
-# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208
-# in order to have proper upgrade paths, we need to obsolete the old/wrong
-# package name
-Obsoletes: libosmo-sccp-0_7_0_208
-%endif
%description -n libosmo-sccp-%libversion
The Signalling Connection Control Part (SCCP) is a network layer
@@ -131,12 +119,6 @@
Summary: Osmocom Message Transfer Part 2 User Adaptation library
License: GPL-2.0+
Group: System/Libraries
-%if "%version" == "0.7.0.284"
-# Version 0.7.0.284 was wrongly packages in lib packages called 0_7_0_208
-# in order to have proper upgrade paths, we need to obsolete the old/wrong
-# package name
-Obsoletes: libosmo-xua-0_7_0_208
-%endif
%description -n libosmo-xua-%libversion
M2UA (RFC 3331) provides an SCTP (RFC 3873) adaptation layer for the
@@ -168,12 +150,11 @@
make %{?_smp_mflags}
%install
-b="%buildroot"
-make %{?_smp_mflags} install DESTDIR="$b"
-find "$b/%_libdir" -type f -name "*.la" -delete
+%make_install
+find "%buildroot/%_libdir" -type f -name "*.la" -delete
%check
-%ifarch ppc64
+%ifnarch ppc64 sparc64 s390x
# still BE problems?
make %{?_smp_mflags} check
%endif
++++++ 0001-build-fixes.patch ++++++
--- /var/tmp/diff_new_pack.TV9Rb3/_old 2017-12-29 18:52:12.194603326 +0100
+++ /var/tmp/diff_new_pack.TV9Rb3/_new 2017-12-29 18:52:12.198602178 +0100
@@ -11,18 +11,18 @@
configure.ac | 2 +-
libosmo-mtp.pc.in | 2 +-
libosmo-sccp.pc.in | 2 +-
- src/Makefile.am | 22 ++++++++++++++++------
+ src/Makefile.am | 20 +++++++++++++++-----
tests/m2ua/Makefile.am | 2 +-
tests/sccp/Makefile.am | 4 ++--
tests/ss7/Makefile.am | 2 --
tests/xua/Makefile.am | 6 ++----
- 8 files changed, 24 insertions(+), 18 deletions(-)
+ 8 files changed, 23 insertions(+), 17 deletions(-)
-Index: libosmo-sccp-0.7.0.208/configure.ac
+Index: libosmo-sccp-0.8.1/configure.ac
===================================================================
---- libosmo-sccp-0.7.0.208.orig/configure.ac
-+++ libosmo-sccp-0.7.0.208/configure.ac
-@@ -17,7 +17,6 @@ AC_PROG_MAKE_SET
+--- libosmo-sccp-0.8.1.orig/configure.ac
++++ libosmo-sccp-0.8.1/configure.ac
+@@ -21,7 +21,6 @@ AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_INSTALL
LT_INIT
@@ -30,18 +30,18 @@
dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
-@@ -26,6 +25,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"
+@@ -30,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"
fi
PKG_PROG_PKG_CONFIG([0.20])
+PKG_CHECK_MODULES([TALLOC], [talloc])
- PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
- PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0)
- PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.6)
-Index: libosmo-sccp-0.7.0.208/libosmo-mtp.pc.in
+ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0)
+ PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0)
+Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in
===================================================================
---- libosmo-sccp-0.7.0.208.orig/libosmo-mtp.pc.in
-+++ libosmo-sccp-0.7.0.208/libosmo-mtp.pc.in
+--- libosmo-sccp-0.8.1.orig/libosmo-mtp.pc.in
++++ libosmo-sccp-0.8.1/libosmo-mtp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: Osmo MTP Lib
Description: Osmo MTP Lib
@@ -49,10 +49,10 @@
-Libs: -L${libdir} -lmtp
+Libs: -L${libdir} -losmo-mtp
Cflags: -I${includedir}/
-Index: libosmo-sccp-0.7.0.208/libosmo-sccp.pc.in
+Index: libosmo-sccp-0.8.1/libosmo-sccp.pc.in
===================================================================
---- libosmo-sccp-0.7.0.208.orig/libosmo-sccp.pc.in
-+++ libosmo-sccp-0.7.0.208/libosmo-sccp.pc.in
+--- libosmo-sccp-0.8.1.orig/libosmo-sccp.pc.in
++++ libosmo-sccp-0.8.1/libosmo-sccp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: OpenBSC SCCP Lib
Description: OpenBSC SCCP Lib
@@ -60,11 +60,11 @@
-Libs: -L${libdir} -lsccp
+Libs: -L${libdir} -losmo-sccp
Cflags: -I${includedir}/
-Index: libosmo-sccp-0.7.0.208/src/Makefile.am
+Index: libosmo-sccp-0.8.1/src/Makefile.am
===================================================================
---- libosmo-sccp-0.7.0.208.orig/src/Makefile.am
-+++ libosmo-sccp-0.7.0.208/src/Makefile.am
-@@ -6,15 +6,21 @@ noinst_HEADERS = sccp_internal.h xua_asp
+--- libosmo-sccp-0.8.1.orig/src/Makefile.am
++++ libosmo-sccp-0.8.1/src/Makefile.am
+@@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h xua_asp
# Legacy static libs
sccpdir = $(libdir)
@@ -91,30 +91,28 @@
# New shared lib
-@@ -32,4 +38,8 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c
- osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \
- osmo_ss7_vty.c sccp_vty.c ipa.c
+@@ -35,3 +41,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c
libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_'
--libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
-+libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) $(LIBOSMOVTY_LIBS)
+ libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
+
+noinst_LTLIBRARIES = libosmo-sigtran-internal.la
+libosmo_sigtran_internal_la_SOURCES = $(libosmo_sigtran_la_SOURCES)
+libosmo_sigtran_internal_la_LIBADD = $(libosmo_sigtran_la_LIBADD)
-Index: libosmo-sccp-0.7.0.208/tests/m2ua/Makefile.am
+Index: libosmo-sccp-0.8.1/tests/m2ua/Makefile.am
===================================================================
---- libosmo-sccp-0.7.0.208.orig/tests/m2ua/Makefile.am
-+++ libosmo-sccp-0.7.0.208/tests/m2ua/Makefile.am
+--- libosmo-sccp-0.8.1.orig/tests/m2ua/Makefile.am
++++ libosmo-sccp-0.8.1/tests/m2ua/Makefile.am
@@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok
noinst_PROGRAMS = m2ua_test
m2ua_test_SOURCES = m2ua_test.c
-m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS)
+m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
-Index: libosmo-sccp-0.7.0.208/tests/sccp/Makefile.am
+Index: libosmo-sccp-0.8.1/tests/sccp/Makefile.am
===================================================================
---- libosmo-sccp-0.7.0.208.orig/tests/sccp/Makefile.am
-+++ libosmo-sccp-0.7.0.208/tests/sccp/Makefile.am
+--- libosmo-sccp-0.8.1.orig/tests/sccp/Makefile.am
++++ libosmo-sccp-0.8.1/tests/sccp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
@@ -128,10 +126,10 @@
-sccp_test_LDADD = $(LIBOSMOCORE_LIBS)
+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
-Index: libosmo-sccp-0.7.0.208/tests/ss7/Makefile.am
+Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am
===================================================================
---- libosmo-sccp-0.7.0.208.orig/tests/ss7/Makefile.am
-+++ libosmo-sccp-0.7.0.208/tests/ss7/Makefile.am
+--- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am
++++ libosmo-sccp-0.8.1/tests/ss7/Makefile.am
@@ -1,7 +1,5 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
@@ -140,10 +138,10 @@
LDADD = $(top_builddir)/src/libosmo-sigtran.la \
$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
-Index: libosmo-sccp-0.7.0.208/tests/xua/Makefile.am
+Index: libosmo-sccp-0.8.1/tests/xua/Makefile.am
===================================================================
---- libosmo-sccp-0.7.0.208.orig/tests/xua/Makefile.am
-+++ libosmo-sccp-0.7.0.208/tests/xua/Makefile.am
+--- libosmo-sccp-0.8.1.orig/tests/xua/Makefile.am
++++ libosmo-sccp-0.8.1/tests/xua/Makefile.am
@@ -1,8 +1,6 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBSCTP_CFLAGS)
@@ -154,4 +152,4 @@
+LDADD = $(top_builddir)/src/libosmo-xua.la $(top_builddir)/src/libosmo-sigtran-internal.la \
$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
- EXTRA_DIST = xua_test.ok
+ EXTRA_DIST = xua_test.ok xua_test.err
++++++ _service ++++++
--- /var/tmp/diff_new_pack.TV9Rb3/_old 2017-12-29 18:52:12.226594139 +0100
+++ /var/tmp/diff_new_pack.TV9Rb3/_new 2017-12-29 18:52:12.226594139 +0100
@@ -2,9 +2,8 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://git.osmocom.org/libosmo-sccp</param>
- <param name="revision">master</param>
- <param name="parent-tag">0.7.0</param>
- <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param>
+ <param name="revision">0.8.1</param>
+ <param name="versionformat">0.8.1</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ libosmo-sccp-0.7.0.284.tar.xz -> libosmo-sccp-0.8.1.tar.xz ++++++
++++ 2439 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package libosmo-netif for openSUSE:Factory checked in at 2017-12-29 18:51:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libosmo-netif (Old)
and /work/SRC/openSUSE:Factory/.libosmo-netif.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmo-netif"
Fri Dec 29 18:51:59 2017 rev:4 rq:560209 version:0.1.1
Changes:
--------
--…
[View More]- /work/SRC/openSUSE:Factory/libosmo-netif/libosmo-netif.changes 2017-10-10 11:42:27.408867331 +0200
+++ /work/SRC/openSUSE:Factory/.libosmo-netif.new/libosmo-netif.changes 2017-12-29 18:52:07.475958562 +0100
@@ -1,0 +2,8 @@
+Wed Dec 27 20:38:21 UTC 2017 - jengelh(a)inai.de
+
+- Update to new upstream release 0.1.1
+ * cosmetic: relax UDP length check
+ * cosmetic: print textual error from recv()
+ * osmux_snprintf: Support different types of Osmux frames
+
+-------------------------------------------------------------------
Old:
----
libosmo-netif-0.0.6.85.tar.xz
New:
----
libosmo-netif-0.1.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libosmo-netif.spec ++++++
--- /var/tmp/diff_new_pack.XZE1VU/_old 2017-12-29 18:52:08.219744939 +0100
+++ /var/tmp/diff_new_pack.XZE1VU/_new 2017-12-29 18:52:08.223743791 +0100
@@ -16,13 +16,13 @@
#
-%define version_unconverted 0.0.6.85
+%define version_unconverted 0.1.1
Name: libosmo-netif
Summary: Osmocom library for muxed audio
License: GPL-2.0+
Group: Productivity/Telephony/Utilities
-Version: 0.0.6.85
+Version: 0.1.1
Release: 0
Url: https://osmocom.org/projects/libosmo-netif
@@ -34,28 +34,27 @@
BuildRequires: lksctp-tools-devel
BuildRequires: pkg-config >= 0.20
BuildRequires: xz
-BuildRequires: pkgconfig(libosmoabis) >= 0.3.2.3
-BuildRequires: pkgconfig(libosmocore) >= 0.3.0
-BuildRequires: pkgconfig(libosmogsm) >= 0.3.0
-BuildRequires: pkgconfig(libosmovty) >= 0.3.0
+BuildRequires: pkgconfig(libosmoabis) >= 0.0.7
+BuildRequires: pkgconfig(libosmocore) >= 0.10.0
+BuildRequires: pkgconfig(libosmogsm) >= 0.10.0
BuildRequires: pkgconfig(talloc)
%description
Network interface demuxer library for OsmoCom projects.
-%package -n libosmonetif3
+%package -n libosmonetif4
Summary: Osmocom library for muxed audio
License: AGPL-3.0+
Group: System/Libraries
-%description -n libosmonetif3
+%description -n libosmonetif4
Network interface demuxer library for OsmoCom projects.
%package -n libosmonetif-devel
Summary: Development files for the Osmocom muxed audio library
License: AGPL-3.0+
Group: Development/Libraries/C and C++
-Requires: libosmonetif3 = %version
+Requires: libosmonetif4 = %version
%description -n libosmonetif-devel
Network interface demuxer library for OsmoCom projects.
@@ -85,12 +84,12 @@
# timing issue
fi
-%post -n libosmonetif3 -p /sbin/ldconfig
-%postun -n libosmonetif3 -p /sbin/ldconfig
+%post -n libosmonetif4 -p /sbin/ldconfig
+%postun -n libosmonetif4 -p /sbin/ldconfig
-%files -n libosmonetif3
+%files -n libosmonetif4
%defattr(-,root,root)
-%_libdir/libosmonetif.so.3*
+%_libdir/libosmonetif.so.4*
%files -n libosmonetif-devel
%defattr(-,root,root)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.XZE1VU/_old 2017-12-29 18:52:08.263732306 +0100
+++ /var/tmp/diff_new_pack.XZE1VU/_new 2017-12-29 18:52:08.263732306 +0100
@@ -2,7 +2,8 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://git.osmocom.org/libosmo-netif</param>
- <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param>
+ <param name="revision">0.1.1</param>
+ <param name="versionformat">0.1.1</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ libosmo-netif-0.0.6.85.tar.xz -> libosmo-netif-0.1.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/configure.ac new/libosmo-netif-0.1.1/configure.ac
--- old/libosmo-netif-0.0.6.85/configure.ac 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/configure.ac 2017-10-28 12:41:34.000000000 +0200
@@ -52,8 +52,8 @@
dnl Generate the output
AM_CONFIG_HEADER(config.h)
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0)
dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here
PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.0.7)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/debian/changelog new/libosmo-netif-0.1.1/debian/changelog
--- old/libosmo-netif-0.0.6.85/debian/changelog 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/debian/changelog 2017-10-28 12:41:34.000000000 +0200
@@ -1,8 +1,18 @@
-libosmo-netif (0.0.7) UNRELEASED; urgency=medium
+libosmo-netif (0.1.1) unstable; urgency=medium
+ * New upstream release.
+
+ -- Harald Welte <lafore(a)gnumonks.org> Sat, 28 Oct 2017 12:41:34 +0200
+
+libosmo-netif (0.1.0) unstable; urgency=medium
+
+ [ Holger Hans Peter Freyther ]
* Move forward toward a new release.
- -- Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Tue, 24 May 2016 23:06:33 +0200
+ [ Harald Welte ]
+ * Update to upstream 0.1.0
+
+ -- Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Fri, 27 Oct 2017 20:00:39 +0200
libosmo-netif (0.0.6) unstable; urgency=medium
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/debian/control new/libosmo-netif-0.1.1/debian/control
--- old/libosmo-netif-0.0.6.85/debian/control 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/debian/control 2017-10-28 12:41:34.000000000 +0200
@@ -21,7 +21,7 @@
Vcs-Git: git://git.osmocom.org/libosmo-netif.git
Homepage: https://projects.osmocom.org/projects/libosmo-netif
-Package: libosmonetif3
+Package: libosmonetif4
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -35,11 +35,10 @@
Package: libosmo-netif-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
+Depends: ${misc:Depends},
libosmocore-dev,
libosmocore,
- libosmonetif3 (= ${binary:Version})
+ libosmonetif4 (= ${binary:Version})
Multi-Arch: same
Description: Development headers for Osmocom network interface
The libosmo-netif library is one of the libraries needed by the
@@ -53,7 +52,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends},
- libosmonetif3,
+ libosmonetif4,
libjs-jquery
Description: Documentation for the Osmo network interface library
The libosmo-netif library is one of the libraries needed by the
@@ -66,7 +65,7 @@
Section: debug
Architecture: any
Priority: extra
-Depends: libosmonetif3 (= ${binary:Version}), ${misc:Depends}
+Depends: libosmonetif4 (= ${binary:Version}), ${misc:Depends}
Multi-Arch: same
Description: Debug symbols for Osmocom network interface library
The libosmo-netif library is one of the libraries needed by the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/debian/libosmonetif3.install new/libosmo-netif-0.1.1/debian/libosmonetif3.install
--- old/libosmo-netif-0.0.6.85/debian/libosmonetif3.install 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/debian/libosmonetif3.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/*/libosmonetif*.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/debian/libosmonetif4.install new/libosmo-netif-0.1.1/debian/libosmonetif4.install
--- old/libosmo-netif-0.0.6.85/debian/libosmonetif4.install 1970-01-01 01:00:00.000000000 +0100
+++ new/libosmo-netif-0.1.1/debian/libosmonetif4.install 2017-10-28 12:41:34.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/*/libosmonetif*.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/debian/rules new/libosmo-netif-0.1.1/debian/rules
--- old/libosmo-netif-0.0.6.85/debian/rules 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/debian/rules 2017-10-28 12:41:34.000000000 +0200
@@ -26,3 +26,6 @@
override_dh_clean:
dh_clean
rm -f tests/package.m4 tests/testsuite .version .tarball-version
+
+override_dh_auto_test:
+ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/examples/Makefile.am new/libosmo-netif-0.1.1/examples/Makefile.am
--- old/libosmo-netif-0.0.6.85/examples/Makefile.am 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/examples/Makefile.am 2017-10-28 12:41:34.000000000 +0200
@@ -14,9 +14,13 @@
rs232-write \
rtp-udp-test-client \
rtp-udp-test-server \
+ udp-test-client \
+ udp-test-server \
osmux-test-input \
osmux-test-output
+noinst_HEADERS = udp-test.h
+
ipa_stream_client_SOURCES = ipa-stream-client.c
ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
@@ -57,6 +61,12 @@
rtp_udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la \
$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+udp_test_client_SOURCES = udp-test-client.c
+udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+
+udp_test_server_SOURCES = udp-test-server.c
+udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+
osmux_test_input_SOURCES = osmux-test-input.c
osmux_test_input_LDADD = $(top_builddir)/src/libosmonetif.la \
$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/examples/udp-test-client.c new/libosmo-netif-0.1.1/examples/udp-test-client.c
--- old/libosmo-netif-0.0.6.85/examples/udp-test-client.c 1970-01-01 01:00:00.000000000 +0100
+++ new/libosmo-netif-0.1.1/examples/udp-test-client.c 2017-10-28 12:41:34.000000000 +0200
@@ -0,0 +1,43 @@
+#include "udp-test.h"
+
+static int read_cb(struct osmo_dgram *conn)
+{
+ struct msgb *msg = print_recv(conn);
+ if (!msg)
+ return -1;
+
+ if (msgb_length(msg))
+ if (msgb_data(msg)[0] >= NUM_MSG - 1)
+ please_dont_die = false; /* end test: */
+
+ msgb_free(msg);
+
+ return 0;
+}
+
+int main(int argc, char **argv)
+{
+ uint8_t i;
+
+ if (!dgram_init(THOST, CPORT, SPORT, read_cb))
+ exit(EXIT_FAILURE);
+
+ for(i = 0; i < NUM_MSG + 1; i++) {
+ /* N. B: moving this alocation outside of the loop will result in segfault */
+ struct msgb *msg = msgb_alloc(MAX_MSG, "UDP/client");
+ if (!msg) {
+ LOGP(DUDP_TEST, LOGL_ERROR, "cann't allocate message\n");
+ return EXIT_FAILURE;
+ }
+
+ if (!mtrim(msg, i, i))
+ return EXIT_FAILURE;
+
+ LOGP(DUDP_TEST, LOGL_NOTICE, "queue [%u] %s\n", msgb_length(msg), msgb_hexdump(msg));
+ osmo_dgram_send(conn, msg);
+ }
+
+ main_loop(THOST, CPORT, SPORT);
+
+ return 0;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/examples/udp-test-server.c new/libosmo-netif-0.1.1/examples/udp-test-server.c
--- old/libosmo-netif-0.0.6.85/examples/udp-test-server.c 1970-01-01 01:00:00.000000000 +0100
+++ new/libosmo-netif-0.1.1/examples/udp-test-server.c 2017-10-28 12:41:34.000000000 +0200
@@ -0,0 +1,35 @@
+#include "udp-test.h"
+
+int read_cb(struct osmo_dgram *conn)
+{
+ int bytes;
+ struct msgb *msg = print_recv(conn);
+
+ if (!msg)
+ return -1;
+
+ /* build reply: */
+ bytes = msgb_length(msg);
+
+ if (!mtrim(msg, 0, bytes))
+ return -1;
+
+ /* sent reply: */
+ osmo_dgram_send(conn, msg);
+
+ /* end test: */
+ if (bytes > NUM_MSG - 1)
+ please_dont_die = false;
+
+ return 0;
+}
+
+int main(int argc, char **argv)
+{
+ if (!dgram_init(THOST, SPORT, CPORT, read_cb))
+ return EXIT_FAILURE;
+
+ main_loop(THOST, SPORT, CPORT);
+
+ return 0;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/examples/udp-test.h new/libosmo-netif-0.1.1/examples/udp-test.h
--- old/libosmo-netif-0.0.6.85/examples/udp-test.h 1970-01-01 01:00:00.000000000 +0100
+++ new/libosmo-netif-0.1.1/examples/udp-test.h 2017-10-28 12:41:34.000000000 +0200
@@ -0,0 +1,137 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <time.h>
+
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/application.h>
+#include <osmocom/core/select.h>
+#include <osmocom/netif/datagram.h>
+
+#define MAX_MSG 255
+#define NUM_MSG 11
+#define DUDP_TEST 0
+#define THOST "127.0.0.1"
+#define SPORT 15000
+#define CPORT 15001
+
+static struct osmo_dgram *conn;
+static void *tall_test;
+bool please_dont_die = true;
+
+static void sighandler(int foo)
+{
+ LOGP(DLINP, LOGL_NOTICE, "closing UDP test...\n");
+ osmo_dgram_close(conn);
+ osmo_dgram_destroy(conn);
+ please_dont_die = false;
+}
+
+static inline struct msgb *print_recv(struct osmo_dgram *conn)
+{
+ struct msgb *msg = msgb_alloc(MAX_MSG, "UDP/test");
+ int bytes;
+
+ LOGP(DUDP_TEST, LOGL_NOTICE, "received datagram: ");
+
+ if (!msg) {
+ LOGPC(DUDP_TEST, LOGL_ERROR, "can't allocate message\n");
+ return NULL;
+ }
+
+ /* receive message: */
+ bytes = osmo_dgram_recv(conn, msg);
+ if (bytes < 0) {
+ LOGPC(DUDP_TEST, LOGL_ERROR, "can't receive message: %u\n", -bytes);
+ msgb_free(msg);
+ return NULL;
+ }
+
+ /* process message: */
+ LOGPC(DUDP_TEST, LOGL_NOTICE, "[%u] %s\n", bytes, msgb_hexdump(msg));
+
+ return msg;
+}
+
+static inline bool dgram_init(const char *host, uint16_t lport, uint16_t rport, void *read_cb)
+{
+ const struct log_info_cat udp_test_cat[] = {
+ [DUDP_TEST] = {
+ .name = "DUDP_TEST",
+ .description = "UDP test",
+ .color = "\033[1;35m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ };
+
+ const struct log_info udp_test_log_info = {
+ .filter_fn = NULL,
+ .cat = udp_test_cat,
+ .num_cat = ARRAY_SIZE(udp_test_cat),
+ };
+
+ signal(SIGINT, sighandler);
+
+ tall_test = talloc_named_const(NULL, 1, "udp_test");
+
+ osmo_init_logging(&udp_test_log_info);
+ log_set_log_level(osmo_stderr_target, LOGL_NOTICE);
+
+ conn = osmo_dgram_create(tall_test);
+ if (!conn) {
+ LOGP(DUDP_TEST, LOGL_ERROR, "cannot create UDP socket\n");
+ return false;
+ }
+
+ osmo_dgram_set_local_addr(conn, host);
+ osmo_dgram_set_local_port(conn, lport);
+ osmo_dgram_set_remote_addr(conn, host);
+ osmo_dgram_set_remote_port(conn, rport);
+ osmo_dgram_set_read_cb(conn, read_cb);
+
+ if (osmo_dgram_open(conn) < 0) {
+ LOGP(DUDP_TEST, LOGL_ERROR, "cannot open client connection %s:%u -> %s:%u\n", host, lport, host, rport);
+ return false;
+ }
+
+ return true;
+}
+
+static inline void main_loop(const char *host, uint16_t lport, uint16_t rport)
+{
+ LOGP(DUDP_TEST, LOGL_NOTICE, "Entering main loop: %s:%u -> %s:%u\n", host, lport, host, rport);
+
+ while(please_dont_die)
+ osmo_select_main(0);
+}
+
+/* Smart message trimmer:
+ * for all positive i trims msg to i - 1
+ * for i = 0 trims msg to 0
+ * for all positive x adds x to msg
+*/
+/*! Smart message trimmer.
+ * \param[in] msg message buffer
+ * \param[in] i trim value: for all positive i, msg is trimmed to i - 1, otherwise msg is trimmed to 0
+ * \param[in] x message content: for all positive x, x is added to msg, otherwise it's ignored
+ */
+static inline bool mtrim(struct msgb *msg, uint8_t i, uint8_t x)
+{
+ if (msgb_trim(msg, i ? i - 1 : i) != 0) {
+ LOGP(DLINP, LOGL_ERROR, "failed to trim message by %u\n", i);
+ return false;
+ }
+
+ if (x)
+ msgb_put_u8(msg, x);
+
+ return true;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/src/Makefile.am new/libosmo-netif-0.1.1/src/Makefile.am
--- old/libosmo-netif-0.0.6.85/src/Makefile.am 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/src/Makefile.am 2017-10-28 12:41:34.000000000 +0200
@@ -1,16 +1,16 @@
# This is _NOT_ the library release version, it's an API version.
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
-LIBVERSION=3:0:0
+LIBVERSION=4:0:0
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS)
+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
SUBDIRS = channel
lib_LTLIBRARIES = libosmonetif.la
-libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS)
+libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS)
libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
libosmonetif_la_SOURCES = amr.c \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/src/channel/abis/Makefile.am new/libosmo-netif-0.1.1/src/channel/abis/Makefile.am
--- old/libosmo-netif-0.0.6.85/src/channel/abis/Makefile.am 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/src/channel/abis/Makefile.am 2017-10-28 12:41:34.000000000 +0200
@@ -1,9 +1,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
noinst_LTLIBRARIES = libosmonetif-abis.la
libosmonetif_abis_la_SOURCES = ipa_stream_server.c \
ipa_stream_client.c
-libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
+libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/src/datagram.c new/libosmo-netif-0.1.1/src/datagram.c
--- old/libosmo-netif-0.0.6.85/src/datagram.c 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/src/datagram.c 2017-10-28 12:41:34.000000000 +0200
@@ -23,6 +23,11 @@
/*! \addtogroup datagram Osmocom Datagram Socket
* @{
+ *
+ * This code is intended to abstract any use of datagram type sockets,
+ * such as UDP. It offers both transmitter and receiver side
+ * implementations, fully integrated with the libosmocore select loop
+ * abstraction.
*/
/*! \file datagram.c
@@ -236,15 +241,15 @@
/*! \brief Receive data via Osmocom datagram receiver
* \param[in] conn Datagram Receiver from which to receive
* \param msg pre-allocate message buffer to which received data is appended
- * \returns number of bytes read, negative on error. */
+ * \returns number of bytes read (might be 0 for empty UDP packet), negative on error. */
int osmo_dgram_rx_recv(struct osmo_dgram_rx *conn,
struct msgb *msg)
{
int ret;
ret = recv(conn->ofd.fd, msg->data, msg->data_len, 0);
- if (ret <= 0) {
- LOGP(DLINP, LOGL_ERROR, "error receiving data from tx\n");
+ if (ret < 0) {
+ LOGP(DLINP, LOGL_ERROR, "error receiving data from tx: %s\n", strerror(errno));
return ret;
}
msgb_put(msg, ret);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/src/osmux.c new/libosmo-netif-0.1.1/src/osmux.c
--- old/libosmo-netif-0.0.6.85/src/osmux.c 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/src/osmux.c 2017-10-28 12:41:34.000000000 +0200
@@ -25,6 +25,15 @@
/*! \addtogroup osmux Osmocom Multiplex Protocol
* @{
+ *
+ * This code implements a variety of utility functions related to the
+ * OSMUX user-plane multiplexing protocol, an efficient alternative to
+ * plain UDP/RTP streams for voice transport in back-haul of cellular
+ * networks.
+ *
+ * For information about the OSMUX protocol design, please see the
+ * OSMUX reference manual at
+ * http://ftp.osmocom.org/docs/latest/osmux-reference.pdf
*/
/*! \file osmux.c
@@ -892,14 +901,24 @@
return offset;
}
-
+/*! Print osmux header fields and payload from msg into buffer buf.
+ * \param[out] buf buffer to store the output into
+ * \param[in] len length of buf in bytes
+ * \param[in] msgb message buffer containing one or more osmux frames
+ * \returns the number of characters printed (excluding the null byte used to end output to strings).
+ *
+ * If the output was truncated due to this limit, then the return value is the number of characters
+ * (excluding the terminating null byte) which would have been written to the final string if enough
+ * space had been available.
+ */
int osmux_snprintf(char *buf, size_t size, struct msgb *msg)
{
unsigned int remain = size;
- int this_len, msg_off = 0;
+ unsigned int msg_off = 0;
struct osmux_hdr *osmuxh;
unsigned int offset = 0;
int msg_len = msg->len;
+ uint32_t payload_len;
int ret;
if (size)
@@ -914,34 +933,50 @@
}
osmuxh = (struct osmux_hdr *)((uint8_t *)msg->data + msg_off);
- if (!osmo_amr_ft_valid(osmuxh->amr_ft)) {
- LOGP(DLMIB, LOGL_ERROR, "Bad AMR FT %d, skipping\n",
- osmuxh->amr_ft);
- return -1;
- }
-
ret = osmux_snprintf_header(buf + offset, remain, osmuxh);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
- this_len = sizeof(struct osmux_hdr) +
- osmux_get_payload_len(osmuxh);
- msg_off += this_len;
+ msg_off += sizeof(struct osmux_hdr);
+ msg_len -= sizeof(struct osmux_hdr);
- if (msg_len < this_len) {
- LOGP(DLMIB, LOGL_ERROR,
- "No room for OSMUX payload: only %d bytes\n",
- msg_len);
+ switch (osmuxh->ft) {
+ case OSMUX_FT_SIGNAL:
+ ret = snprintf(buf + offset, remain, "[signal]");
+ SNPRINTF_BUFFER_SIZE(ret, remain, offset);
return -1;
- }
+ case OSMUX_FT_DUMMY:
+ case OSMUX_FT_VOICE_AMR:
+ if (!osmo_amr_ft_valid(osmuxh->amr_ft)) {
+ LOGP(DLMIB, LOGL_ERROR, "Bad AMR FT %d, skipping\n",
+ osmuxh->amr_ft);
+ return -1;
+ }
- ret = osmux_snprintf_payload(buf + offset, remain,
- osmux_get_payload(osmuxh),
- osmux_get_payload_len(osmuxh));
- SNPRINTF_BUFFER_SIZE(ret, remain, offset);
+ payload_len = osmux_get_payload_len(osmuxh);
- msg_len -= this_len;
- }
+ if (msg_len < payload_len) {
+ LOGP(DLMIB, LOGL_ERROR,
+ "No room for OSMUX payload: only %d bytes\n",
+ msg_len);
+ return -1;
+ }
+
+ if (osmuxh->ft == OSMUX_FT_VOICE_AMR) {
+ ret = osmux_snprintf_payload(buf + offset, remain,
+ osmux_get_payload(osmuxh),
+ payload_len);
+ SNPRINTF_BUFFER_SIZE(ret, remain, offset);
+ }
+ msg_off += payload_len;
+ msg_len -= payload_len;
+ break;
+ default:
+ LOGP(DLMIB, LOGL_ERROR, "Unknown OSMUX ft value %d\n",
+ osmuxh->ft);
+ return -1;
+ }
+ }
return offset;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/src/rs232.c new/libosmo-netif-0.1.1/src/rs232.c
--- old/libosmo-netif-0.0.6.85/src/rs232.c 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/src/rs232.c 2017-10-28 12:41:34.000000000 +0200
@@ -35,7 +35,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/logging.h>
#include <osmocom/core/talloc.h>
-#include <osmocom/abis/e1_input.h>
+#include <osmocom/core/timer.h>
struct osmo_rs232 {
struct osmo_fd ofd;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif-0.0.6.85/src/stream.c new/libosmo-netif-0.1.1/src/stream.c
--- old/libosmo-netif-0.0.6.85/src/stream.c 2017-09-12 13:28:41.000000000 +0200
+++ new/libosmo-netif-0.1.1/src/stream.c 2017-10-28 12:41:34.000000000 +0200
@@ -30,6 +30,11 @@
/*! \addtogroup stream Osmocom Stream Socket
* @{
+ *
+ * This code is intended to abstract any use of stream-type sockets,
+ * such as TCP and SCTP. It offers both server and client side
+ * implementations, fully integrated with the libosmocore select loop
+ * abstraction.
*/
/*! \file stream.c
++++++ osmo-talloc.diff ++++++
--- /var/tmp/diff_new_pack.XZE1VU/_old 2017-12-29 18:52:08.403692108 +0100
+++ /var/tmp/diff_new_pack.XZE1VU/_new 2017-12-29 18:52:08.407690960 +0100
@@ -5,16 +5,16 @@
---
configure.ac | 1 +
- examples/Makefile.am | 26 +++++++++++++-------------
+ examples/Makefile.am | 30 +++++++++++++++---------------
examples/channel/Makefile.am | 6 +++---
src/Makefile.am | 4 ++--
src/channel/abis/Makefile.am | 4 ++--
- 5 files changed, 21 insertions(+), 20 deletions(-)
+ 5 files changed, 23 insertions(+), 22 deletions(-)
-Index: libosmo-netif-0.0.6.85/configure.ac
+Index: libosmo-netif-0.1.1/configure.ac
===================================================================
---- libosmo-netif-0.0.6.85.orig/configure.ac
-+++ libosmo-netif-0.0.6.85/configure.ac
+--- libosmo-netif-0.1.1.orig/configure.ac
++++ libosmo-netif-0.1.1/configure.ac
@@ -68,6 +68,7 @@ AC_SEARCH_LIBS([sctp_send], [sctp], [
AC_MSG_ERROR([sctp_send not found in searched libs])])
LIBS=$old_LIBS
@@ -23,10 +23,10 @@
AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))
AC_ARG_ENABLE(doxygen,
-Index: libosmo-netif-0.0.6.85/examples/Makefile.am
+Index: libosmo-netif-0.1.1/examples/Makefile.am
===================================================================
---- libosmo-netif-0.0.6.85.orig/examples/Makefile.am
-+++ libosmo-netif-0.0.6.85/examples/Makefile.am
+--- libosmo-netif-0.1.1.orig/examples/Makefile.am
++++ libosmo-netif-0.1.1/examples/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
@@ -34,7 +34,7 @@
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
SUBDIRS = channel
-@@ -19,48 +19,48 @@ noinst_PROGRAMS = ipa-stream-client \
+@@ -23,54 +23,54 @@ noinst_HEADERS = udp-test.h
ipa_stream_client_SOURCES = ipa-stream-client.c
ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
@@ -86,6 +86,14 @@
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
+ udp_test_client_SOURCES = udp-test-client.c
+-udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
++udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
+
+ udp_test_server_SOURCES = udp-test-server.c
+-udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
++udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
+
osmux_test_input_SOURCES = osmux-test-input.c
osmux_test_input_LDADD = $(top_builddir)/src/libosmonetif.la \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
@@ -95,10 +103,10 @@
osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
-Index: libosmo-netif-0.0.6.85/examples/channel/Makefile.am
+Index: libosmo-netif-0.1.1/examples/channel/Makefile.am
===================================================================
---- libosmo-netif-0.0.6.85.orig/examples/channel/Makefile.am
-+++ libosmo-netif-0.0.6.85/examples/channel/Makefile.am
+--- libosmo-netif-0.1.1.orig/examples/channel/Makefile.am
++++ libosmo-netif-0.1.1/examples/channel/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
@@ -117,40 +125,40 @@
abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
-Index: libosmo-netif-0.0.6.85/src/Makefile.am
+Index: libosmo-netif-0.1.1/src/Makefile.am
===================================================================
---- libosmo-netif-0.0.6.85.orig/src/Makefile.am
-+++ libosmo-netif-0.0.6.85/src/Makefile.am
+--- libosmo-netif-0.1.1.orig/src/Makefile.am
++++ libosmo-netif-0.1.1/src/Makefile.am
@@ -3,14 +3,14 @@
- LIBVERSION=3:0:0
+ LIBVERSION=4:0:0
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
--AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS)
-+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) $(TALLOC_CFLAGS)
+-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS)
++AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) $(TALLOC_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
SUBDIRS = channel
lib_LTLIBRARIES = libosmonetif.la
--libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS)
-+libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) $(TALLOC_LIBS)
+-libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS)
++libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) $(TALLOC_LIBS)
libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
libosmonetif_la_SOURCES = amr.c \
-Index: libosmo-netif-0.0.6.85/src/channel/abis/Makefile.am
+Index: libosmo-netif-0.1.1/src/channel/abis/Makefile.am
===================================================================
---- libosmo-netif-0.0.6.85.orig/src/channel/abis/Makefile.am
-+++ libosmo-netif-0.0.6.85/src/channel/abis/Makefile.am
+--- libosmo-netif-0.1.1.orig/src/channel/abis/Makefile.am
++++ libosmo-netif-0.1.1/src/channel/abis/Makefile.am
@@ -1,9 +1,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
--AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
-+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS)
+-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
++AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
noinst_LTLIBRARIES = libosmonetif-abis.la
libosmonetif_abis_la_SOURCES = ipa_stream_server.c \
ipa_stream_client.c
--libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
-+libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS)
+-libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS)
++libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS)
[View Less]
1
0
Hello community,
here is the log from the commit of package libosmocore for openSUSE:Factory checked in at 2017-12-29 18:51:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libosmocore (Old)
and /work/SRC/openSUSE:Factory/.libosmocore.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmocore"
Fri Dec 29 18:51:54 2017 rev:14 rq:560208 version:0.10.2
Changes:
--------
--- /…
[View More]work/SRC/openSUSE:Factory/libosmocore/libosmocore.changes 2017-10-09 19:44:58.484144898 +0200
+++ /work/SRC/openSUSE:Factory/.libosmocore.new/libosmocore.changes 2017-12-29 18:52:03.785018630 +0100
@@ -1,0 +2,14 @@
+Wed Dec 27 20:10:30 UTC 2017 - jengelh(a)inai.de
+
+- Update to new upstream release 0.10.2
+ * GPRS: print remote state info for NS peer
+ * ctrl: allow more nodes than those in enum ctrl_node_type
+ * fsm: Enforce FSM and FSM instance names are valid osmocom
+ identifiers
+ * rate_ctr: Enforce counter (and ctr_group) names are valid
+ identifiers
+ * Convert lib-internal rate_ctr from '.' separator to ':'
+ separator
+ * GPRS: add vty command to show only persistent NS
+
+-------------------------------------------------------------------
Old:
----
libosmocore-0.9.6.400.tar.xz
New:
----
libosmocore-0.10.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libosmocore.spec ++++++
--- /var/tmp/diff_new_pack.F6eNbQ/_old 2017-12-29 18:52:04.640772851 +0100
+++ /var/tmp/diff_new_pack.F6eNbQ/_new 2017-12-29 18:52:04.644771702 +0100
@@ -16,12 +16,12 @@
#
-%define version_unconverted 0.9.6.400
+%define version_unconverted 0.10.2
Name: libosmocore
-Version: 0.9.6.400
+Version: 0.10.2
Release: 0
-Summary: Open Source Mobile Communications Core Library
+Summary: The Open Source Mobile Communications Core Library
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and AGPL-3.0+
Group: Productivity/Telephony/Utilities
Url: https://osmocom.org/projects/libosmocore/wiki/Libosmocore
@@ -111,13 +111,13 @@
This subpackage contains libraries and header files for developing
applications that want to make use of libosmocoding.
-%package -n libosmocore8
+%package -n libosmocore9
Summary: Osmocom core library
# crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+
License: GPL-2.0 and GPL-2.0+
Group: System/Libraries
-%description -n libosmocore8
+%description -n libosmocore9
libosmocore is a library with various utility functions shared
between OpenBSC and OsmocomBB.
@@ -126,7 +126,7 @@
# crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+
License: GPL-2.0 and GPL-2.0+
Group: Development/Libraries/C and C++
-Requires: libosmocore8 = %version
+Requires: libosmocore9 = %version
Requires: libtalloc-devel
%description -n libosmocore-devel
@@ -163,12 +163,12 @@
This subpackage contains libraries and header files for developing
applications that want to make use of libosmoctrl.
-%package -n libosmogb4
+%package -n libosmogb5
Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library
License: AGPL-3.0+
Group: System/Libraries
-%description -n libosmogb4
+%description -n libosmogb5
libosmocore is a package with various utility functions that were
originally developed as part of the OpenBSC project.
@@ -179,7 +179,7 @@
License: AGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libosmocore-devel = %version
-Requires: libosmogb4 = %version
+Requires: libosmogb5 = %version
Requires: libosmogsm-devel = %version
%description -n libosmogb-devel
@@ -188,12 +188,12 @@
This subpackage contains libraries and header files for developing
applications that want to make use of libosmogb.
-%package -n libosmogsm6
+%package -n libosmogsm8
Summary: Osmocom GSM utility library
License: GPL-2.0+ and AGPL-3.0+
Group: System/Libraries
-%description -n libosmogsm6
+%description -n libosmogsm8
libosmocore is a package with various utility functions that were
originally developed as part of the OpenBSC project.
@@ -208,7 +208,7 @@
License: GPL-2.0+ and AGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libosmocore-devel = %version
-Requires: libosmogsm6 = %version
+Requires: libosmogsm8 = %version
%description -n libosmogsm-devel
The libosmogsm library in particular is a collection of common code
@@ -246,12 +246,12 @@
This subpackage contains libraries and header files for developing
applications that want to make use of libosmosim.
-%package -n libosmovty3
+%package -n libosmovty4
Summary: Osmocom VTY interface library
License: GPL-2.0+
Group: System/Libraries
-%description -n libosmovty3
+%description -n libosmovty4
libosmocore is a package with various utility functions that were
originally developed as part of the OpenBSC project.
@@ -263,7 +263,7 @@
License: GPL-2.0+
Group: Development/Libraries/C and C++
Requires: libosmocore-devel = %version
-Requires: libosmovty3 = %version
+Requires: libosmovty4 = %version
%description -n libosmovty-devel
The libosmovty library implements the interactive command-line on the
@@ -296,18 +296,18 @@
%postun -n libosmocodec0 -p /sbin/ldconfig
%post -n libosmocoding0 -p /sbin/ldconfig
%postun -n libosmocoding0 -p /sbin/ldconfig
-%post -n libosmocore8 -p /sbin/ldconfig
-%postun -n libosmocore8 -p /sbin/ldconfig
+%post -n libosmocore9 -p /sbin/ldconfig
+%postun -n libosmocore9 -p /sbin/ldconfig
%post -n libosmoctrl0 -p /sbin/ldconfig
%postun -n libosmoctrl0 -p /sbin/ldconfig
-%post -n libosmogb4 -p /sbin/ldconfig
-%postun -n libosmogb4 -p /sbin/ldconfig
-%post -n libosmogsm6 -p /sbin/ldconfig
-%postun -n libosmogsm6 -p /sbin/ldconfig
+%post -n libosmogb5 -p /sbin/ldconfig
+%postun -n libosmogb5 -p /sbin/ldconfig
+%post -n libosmogsm8 -p /sbin/ldconfig
+%postun -n libosmogsm8 -p /sbin/ldconfig
%post -n libosmosim0 -p /sbin/ldconfig
%postun -n libosmosim0 -p /sbin/ldconfig
-%post -n libosmovty3 -p /sbin/ldconfig
-%postun -n libosmovty3 -p /sbin/ldconfig
+%post -n libosmovty4 -p /sbin/ldconfig
+%postun -n libosmovty4 -p /sbin/ldconfig
%files tools
%defattr(-,root,root)
@@ -337,9 +337,9 @@
%_libdir/libosmocoding.so
%_libdir/pkgconfig/libosmocoding.pc
-%files -n libosmocore8
+%files -n libosmocore9
%defattr(-,root,root)
-%_libdir/libosmocore.so.8*
+%_libdir/libosmocore.so.9*
%files -n libosmocore-devel
%defattr(-,root,root)
@@ -361,9 +361,9 @@
%_libdir/libosmoctrl.so
%_libdir/pkgconfig/libosmoctrl.pc
-%files -n libosmogb4
+%files -n libosmogb5
%defattr(-,root,root)
-%_libdir/libosmogb.so.4*
+%_libdir/libosmogb.so.5*
%files -n libosmogb-devel
%defattr(-,root,root)
@@ -373,9 +373,9 @@
%_libdir/libosmogb.so
%_libdir/pkgconfig/libosmogb.pc
-%files -n libosmogsm6
+%files -n libosmogsm8
%defattr(-,root,root)
-%_libdir/libosmogsm.so.6*
+%_libdir/libosmogsm.so.8*
%files -n libosmogsm-devel
%defattr(-,root,root)
@@ -398,9 +398,9 @@
%_libdir/libosmosim.so
%_libdir/pkgconfig/libosmosim.pc
-%files -n libosmovty3
+%files -n libosmovty4
%defattr(-,root,root)
-%_libdir/libosmovty.so.3*
+%_libdir/libosmovty.so.4*
%files -n libosmovty-devel
%defattr(-,root,root)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.F6eNbQ/_old 2017-12-29 18:52:04.692757920 +0100
+++ /var/tmp/diff_new_pack.F6eNbQ/_new 2017-12-29 18:52:04.692757920 +0100
@@ -2,8 +2,8 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://git.osmocom.org/libosmocore</param>
- <param name="revision">master</param>
- <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param>
+ <param name="revision">0.10.2</param>
+ <param name="versionformat">0.10.2</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ libosmocore-0.9.6.400.tar.xz -> libosmocore-0.10.2.tar.xz ++++++
++++ 6129 lines of diff (skipped)
[View Less]
1
0