diff --git a/nemo-dropbox_no-dropbox-bin.patch b/nemo-dropbox_no-dropbox-bin.patch index 9ee1c42..383aabf 100644 --- a/nemo-dropbox_no-dropbox-bin.patch +++ b/nemo-dropbox_no-dropbox-bin.patch @@ -1,11 +1,11 @@ ---- nemo-dropbox.orig/data/icons/Makefile.am -+++ nemo-dropbox/data/icons/Makefile.am +--- a/nemo-dropbox/data/icons/Makefile.am 2019-02-08 16:11:14.000000000 +0600 ++++ b/nemo-dropbox/data/icons/Makefile.am 2019-04-26 16:24:53.987859398 +0600 @@ -1 +1 @@ -SUBDIRS = hicolor nemo-dropbox -\ No newline at end of file +\ В конце файла нет новой строки +SUBDIRS = nemo-dropbox ---- nemo-dropbox.orig/data/Makefile.am -+++ nemo-dropbox/data/Makefile.am +--- a/nemo-dropbox/data/Makefile.am 2019-02-08 16:11:14.000000000 +0600 ++++ b/nemo-dropbox/data/Makefile.am 2019-04-26 16:22:54.579516828 +0600 @@ -1,6 +1 @@ -applicationdir = $(datadir)/applications -application_DATA = dropbox.desktop @@ -13,8 +13,8 @@ -EXTRA_DIST = $(application_DATA) - SUBDIRS = icons emblems ---- nemo-dropbox.orig/Makefile.am -+++ nemo-dropbox/Makefile.am +--- a/nemo-dropbox/Makefile.am 2019-02-08 16:11:14.000000000 +0600 ++++ b/nemo-dropbox/Makefile.am 2019-04-26 16:20:16.871064377 +0600 @@ -1,16 +1,6 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip diff --git a/nemo-extensions-3.8.0.tar.gz b/nemo-extensions-3.8.0.tar.gz deleted file mode 100644 index c65ae15..0000000 --- a/nemo-extensions-3.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15855cf7880290c8e9956f894d8e3c6fb0bee996783b2af63ae66dc019e739a8 -size 810400 diff --git a/nemo-extensions-4.2.0.tar.gz b/nemo-extensions-4.2.0.tar.gz new file mode 100644 index 0000000..6c656ca --- /dev/null +++ b/nemo-extensions-4.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5 +size 790357 diff --git a/nemo-extensions.changes b/nemo-extensions.changes index fdf96aa..201989c 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Jul 1 04:01:05 UTC 2019 - Dead Mozay + +- Update to version 4.2.0: + * l10n: Update POT + * Add import version for GtkSource (#323) + * Update nemo-terminal.py ... (#309) + * nemo-share: Check the file permissions for the full path + * nemo-share: Warn when the share is within an encrypted home directory + * nemo-share: Improve warnings handling + * nemo-share: Add UFW rules for Samba when setting it up + * nemo-share: Remove trailing spaces + * nemo-terminal: add l10n support (#303) + * nemo-python: Fix some memory leaks revealed by valgrind in nemo + * nemo-emblems 4.0.2 + * emblems: l10n fix (#302) + +------------------------------------------------------------------- +Fri Mar 15 03:06:59 UTC 2019 - Dead Mozay + +- Update to version 4.0.0: + * nemo-python: Fix some memory leaks revealed by valgrind in nemo + * nemo-terminal: add l10n support + * nemo-terminal: Fix feed_child function for yet another introspection + * nemo-seahorse: Allow building against gnupg 2.2 + * emblems: l10n fix + * fix nemo-emblems not working (#300) + * nemo-terminal: Fix default terminal height when terminal position +- Rebase nemo-seahorse_no-nautilus-conflicts.patch +- Rebase nemo-dropbox_no-dropbox-bin.patch +- Remove patch nemo-seahorse_gpg-2.2.patch no longer needed +- Rebase nemo-share-prevent-privilege-escalation.patch + ------------------------------------------------------------------- Mon Aug 6 14:09:43 UTC 2018 - sor.alexei@meowr.ru diff --git a/nemo-extensions.spec b/nemo-extensions.spec index a1e64bd..f5ccd0f 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -19,9 +19,9 @@ # Do not package nemo-extension-media-columns for now: slows Nemo down. # nemo-extension-terminal 'requires' two versions, confusing typelib finder. %define __requires_exclude typelib\\((Vte))\ = -%define _version 3.8.0 +%define _version 4.0.0 Name: nemo-extensions -Version: 3.8.0 +Version: 4.2.0 Release: 0 Summary: Set of extensions for Nemo, the Cinnamon file manager License: GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later @@ -32,8 +32,6 @@ Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/ Patch0: nemo-seahorse_no-nautilus-conflicts.patch # PATCH-FIX-OPENSUSE nemo-dropbox_no-dropbox-bin.patch sor.alexei@meowr.ru -- Strip dropbox binary installation from nemo-dropbox. Patch1: nemo-dropbox_no-dropbox-bin.patch -# PATCH-FIX-OPENSUSE nemo-seahorse_gpg-2.2.patch sor.alexei@meowr.ru -- Add GPG 2.2 to accepted versions in nemo-seahorse. -Patch2: nemo-seahorse_gpg-2.2.patch # PATCH-FIX-OPENSUSE nemo-gtkhash_openssl-1.1.patch sor.alexei@meowr.ru -- Add basic OpenSSL 1.1+ compatibility in nemo-gtkhash. Patch3: nemo-gtkhash_openssl-1.1.patch # PATCH-FIX-UPSTREAM nemo-share-prevent-privilege-escalation.patch bsc#1084703 -- Prevent unprivileged users from adding other users to sambashare (commit a831e7b). @@ -41,6 +39,7 @@ Patch4: nemo-share-prevent-privilege-escalation.patch BuildRequires: gettext-runtime BuildRequires: gnome-common BuildRequires: intltool +BuildRequires: fdupes BuildRequires: libgcrypt-devel BuildRequires: libgpgme-devel BuildRequires: libtool @@ -76,9 +75,9 @@ BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(xreader-document-1.5) BuildRequires: pkgconfig(xreader-view-1.5) %if 0%{?suse_version} >= 1500 -BuildRequires: python2-distutils-extra -BuildRequires: python2-docutils -BuildRequires: python2-setuptools +BuildRequires: python3-distutils-extra +BuildRequires: python3-docutils +BuildRequires: python3-setuptools %else BuildRequires: python-distutils-extra BuildRequires: python-docutils @@ -365,102 +364,87 @@ hotkey (default F4) and automatically follows the currently active directory in Nemo. %prep -%setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -# Remove spurious executable permission. -chmod a-x nemo-audio-tab/COPYING.GPL3 nemo-emblems/COPYING.GPL3 - +%autosetup -p1 + %build -find . -type d -maxdepth 1 -mindepth 1 | while read dir; do - pushd "$dir" - if [ -f meson.build ]; then - %meson - %meson_build - fi - [ -f autogen.sh ] && NOCONFIGURE=1 ./autogen.sh - if [ -f configure ]; then - %configure \ - --disable-static - fi - [ -f Makefile ] && make %{?_smp_mflags} V=1 - [ -f setup.py ] && ./setup.py build - popd -done - -# For nemo-extension-gtkhash. -pushd nemo-gtkhash -%configure \ - --disable-static \ - --enable-linux-crypto \ - --enable-libcrypto \ - --enable-gcrypt \ - --enable-mbedtls \ - --enable-nettle \ - --enable-nss \ - --enable-mhash \ - --enable-nemo -make %{?_smp_mflags} V=1 +pushd nemo-pastebin +%py3_build popd - -%install -find . -type d -maxdepth 1 -mindepth 1 | while read dir; do - pushd "$dir" - if [ -f meson.build ]; then - %meson_install - fi - if [ -f Makefile ]; then - %make_install - fi - [ -f setup.py ] && ./setup.py install --root=%{buildroot} --prefix=%{_prefix} - popd -done - -# For python-nemo. -mkdir -p %{buildroot}%{_docdir}/ -mv -f %{buildroot}%{_datadir}/doc/nemo-python/ %{buildroot}%{_docdir}/nemo-python/ - -# For nemo-extension-audio-tab. -install -Dpm 0644 nemo-audio-tab/nemo-extension/nemo-audio-tab.py \ - %{buildroot}%{_datadir}/nemo-python/extensions/nemo-audio-tab.py -install -Dpm 0755 nemo-audio-tab/nemo-extension/nemo-audio-tab.glade \ - %{buildroot}%{_datadir}/nemo-python/extensions/nemo-audio-tab.glade - -# For nemo-extension-compare. -install -Dpm 0755 nemo-compare/src/nemo-compare.py \ - %{buildroot}%{_datadir}/nemo-compare/nemo-compare.py -install -Dpm 0755 nemo-compare/src/utils.py %{buildroot}%{_datadir}/nemo-compare/utils.py -install -Dpm 0755 nemo-compare/src/nemo-compare-preferences.py \ - %{buildroot}%{_datadir}/nemo-compare/nemo-compare-preferences.py -install -Dpm 0644 nemo-compare/debian/nemo-compare-preferences.1 \ - %{buildroot}%{_mandir}/man1/nemo-compare-preferences.1 - -mkdir -p %{buildroot}%{_bindir}/ %{buildroot}%{_datadir}/nemo-python/ -ln -s %{_datadir}/nemo-compare/nemo-compare.py %{buildroot}%{_datadir}/nemo-python/extensions/nemo-compare.py -ln -s %{_datadir}/nemo-compare/nemo-compare-preferences.py %{buildroot}%{_bindir}/nemo-compare-preferences - -# For nemo-extension-terminal. + +pushd nemo-fileroller +NOCONFIGURE=1 ./autogen.sh +%configure +%make_build V=1 +popd + +pushd nemo-python +%meson +%meson_build +popd + pushd nemo-terminal -mkdir -p %{buildroot}%{_datadir}/nemo-terminal/ -install -Dpm 0755 src/nemo_terminal.py \ - %{buildroot}%{_datadir}/nemo-python/extensions/nemo_terminal.py -cp -a src/*.xml %{buildroot}%{_datadir}/glib-2.0/schemas/ -cp -a pixmap/*.png %{buildroot}%{_datadir}/nemo-terminal/ +%py3_build +popd + +pushd nemo-preview +NOCONFIGURE=1 ./autogen.sh +intltoolize -f +%configure +%make_build V=1 +popd + +pushd nemo-emblems +%py3_build +popd + +pushd nemo-image-converter +NOCONFIGURE=1 gnome-autogen.sh +%configure +%make_build V=1 +popd + +pushd nemo-compare +%py3_build +popd + +%install +pushd nemo-pastebin +%py3_install +popd + +pushd nemo-fileroller +%make_install +popd + +pushd nemo-python +%meson_install +popd + +pushd nemo-terminal +%py3_install +popd + +pushd nemo-preview +%make_install +popd + +pushd nemo-emblems +%py3_install +popd + +pushd nemo-image-converter +%make_install +popd + +pushd nemo-compare +%py3_install popd -# Remove unused translations. -rm %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/nemo-*.mo - -# Compile Python bytecode. -dirname $(find %{buildroot}%{_datadir}/ -type f -name '*.py') | sort -u | while read dir; do - %py_compile . -done - +%find_lang nemo-preview find %{buildroot} -type f -name "*.la" -delete -print +%fdupes %{buildroot}/%{_prefix} + %if 0%{?suse_version} >= 1500 %post -n python2-nemo -p /sbin/ldconfig @@ -528,7 +512,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %endif %license nemo-python/COPYING %doc nemo-python/AUTHORS nemo-python/debian/changelog -%doc %{_docdir}/nemo-python/ %{_libdir}/nemo/extensions-3.0/libnemo-python.so %{_libdir}/pkgconfig/nemo-python.pc %dir %{_datadir}/nemo-python/ @@ -537,41 +520,34 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n nemo-extension-audio-tab %license nemo-audio-tab/COPYING* %doc nemo-audio-tab/debian/changelog -%{_datadir}/nemo-python/extensions/nemo-audio-tab.* -%{python_sitelib}/nemo_audio_tab-* %files -n nemo-extension-compare %license nemo-compare/nemo-compare/COPYING* %doc nemo-compare/debian/changelog %{_bindir}/nemo-compare-preferences %{_datadir}/nemo-compare/ +%{python3_sitelib}/nemo_compare-%{version}-py?.?.egg-info %{_datadir}/nemo-python/extensions/nemo-compare.py -%{_mandir}/man1/nemo-compare-preferences.1%{?ext_man} %files -n nemo-extension-dropbox %license nemo-dropbox/COPYING %doc nemo-dropbox/AUTHORS nemo-dropbox/debian/changelog -%{_libdir}/nemo/extensions-3.0/libnemo-dropbox.so -%{_datadir}/nemo-dropbox/ %files -n nemo-extension-emblems %license nemo-emblems/COPYING* %doc nemo-emblems/debian/changelog -%{_datadir}/nemo-python/extensions/nemo-emblems.py -%{python_sitelib}/nemo_emblems-* +%{_datadir}/nemo-python/extensions/nemo-emblems.py* +%{python3_sitelib}/nemo_emblems-%{version}-py?.?.egg-info %files -n nemo-extension-fileroller %license nemo-fileroller/COPYING %doc nemo-fileroller/debian/changelog +%exclude %{_libdir}/nemo/extensions-3.0/libnemo-fileroller.a %{_libdir}/nemo/extensions-3.0/libnemo-fileroller.so %files -n nemo-extension-gtkhash %license nemo-gtkhash/COPYING %doc nemo-gtkhash/AUTHORS nemo-gtkhash/debian/changelog -%{_bindir}/gtkhash -%{_libdir}/nemo/extensions-3.0/libgtkhash-properties.so -%{_datadir}/nemo-gtkhash/ -%{_datadir}/glib-2.0/schemas/*gtkhash*.gschema.xml %files -n nemo-extension-image-converter %license nemo-image-converter/COPYING @@ -582,14 +558,15 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n nemo-extension-pastebin %license nemo-pastebin/COPYING %doc nemo-pastebin/debian/changelog -%{_bindir}/nemo-pastebin.py -%{_bindir}/nemo-pastebin-configurator.py +%{_bindir}/nemo-pastebin-configurator %{_datadir}/nemo-pastebin/ -%{python_sitelib}/nemo_pastebin-* -%{_datadir}/pixmaps/nemo-pastebin.* +%{_datadir}/nemo-python/extensions/nemo-pastebin.py +%{_datadir}/icons/hicolor/*/apps/nemo-pastebin.png +%{_datadir}/icons/hicolor/scalable/apps/nemo-pastebin.svg %{_datadir}/glib-2.0/schemas/nemo-pastebin.gschema.xml +%{python3_sitelib}/nemo_pastebin-%{version}-py?.?.egg-info -%files -n nemo-extension-preview +%files -n nemo-extension-preview -f nemo-preview.lang %license nemo-preview/COPYING %doc nemo-preview/AUTHORS nemo-preview/debian/changelog %{_bindir}/nemo-preview @@ -601,27 +578,23 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n nemo-extension-repairer %license nemo-repairer/COPYING %doc nemo-repairer/AUTHORS nemo-repairer/README -%{_bindir}/nemo-filename-repairer -%{_libdir}/nemo/extensions-3.0/libnemo-filename-repairer.so -%{_datadir}/nemo-filename-repairer/ %files -n nemo-extension-seahorse %license nemo-seahorse/COPYING %doc nemo-seahorse/debian/changelog -%{_libdir}/nemo/extensions-3.0/libnemo-seahorse.so %files -n nemo-extension-share %license nemo-share/COPYING %doc nemo-share/AUTHORS nemo-share/debian/changelog -%{_libdir}/nemo/extensions-3.0/libnemo-share.so -%{_datadir}/nemo-share/ -%{_datadir}/polkit-1/actions/org.nemo.share.samba_install.policy %files -n nemo-extension-terminal %license nemo-terminal/COPYING %doc nemo-terminal/AUTHORS nemo-terminal/debian/changelog +%{_bindir}/nemo-terminal-prefs %{_datadir}/nemo-terminal/ %{_datadir}/nemo-python/extensions/nemo_terminal.py %{_datadir}/glib-2.0/schemas/org.nemo.extensions.nemo-terminal.gschema.xml +%{python3_sitelib}/nemo_terminal-%{version}-py?.?.egg-info +%{python3_sitelib}/nemo_terminal-%{version}-py?.?.egg-info/* %changelog diff --git a/nemo-gtkhash_openssl-1.1.patch b/nemo-gtkhash_openssl-1.1.patch index d0ff1b2..8faebb9 100644 --- a/nemo-gtkhash_openssl-1.1.patch +++ b/nemo-gtkhash_openssl-1.1.patch @@ -1,5 +1,5 @@ ---- nemo-gtkhash.orig/src/hash/hash-lib-crypto.c -+++ nemo-gtkhash/src/hash/hash-lib-crypto.c +--- a/nemo-gtkhash/src/hash/hash-lib-crypto.c 2019-02-08 16:11:14.000000000 +0600 ++++ b/nemo-gtkhash/src/hash/hash-lib-crypto.c 2019-04-26 16:38:09.666130133 +0600 @@ -34,7 +34,7 @@ #define LIB_DATA ((struct hash_lib_crypto_s *)func->lib_data) @@ -9,7 +9,7 @@ }; static const EVP_MD *gtkhash_hash_lib_crypto_get_md(const enum hash_func_e id) -@@ -44,8 +44,10 @@ static const EVP_MD *gtkhash_hash_lib_cr +@@ -44,8 +44,10 @@ return EVP_md4(); case HASH_FUNC_MD5: return EVP_md5(); @@ -20,14 +20,14 @@ case HASH_FUNC_SHA1: return EVP_sha1(); case HASH_FUNC_RIPEMD160: -@@ -69,9 +71,13 @@ bool gtkhash_hash_lib_crypto_is_supporte +@@ -69,9 +71,13 @@ if (!(md = gtkhash_hash_lib_crypto_get_md(id))) return false; - EVP_MD_CTX_init(&data.ctx); - bool ret = (EVP_DigestInit_ex(&data.ctx, md, NULL) == 1); - EVP_MD_CTX_cleanup(&data.ctx); -+ data.ctx = EVP_MD_CTX_create(); ++ data.ctx = EVP_MD_CTX_init(&data.ctx); + bool ret = (EVP_DigestInit_ex(data.ctx, md, NULL) == 1); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + EVP_MD_CTX_destroy(data.ctx); @@ -37,7 +37,7 @@ return ret; } -@@ -84,37 +90,45 @@ void gtkhash_hash_lib_crypto_start(struc +@@ -84,37 +90,45 @@ if (!(md = gtkhash_hash_lib_crypto_get_md(func->id))) g_assert_not_reached(); diff --git a/nemo-seahorse_gpg-2.2.patch b/nemo-seahorse_gpg-2.2.patch deleted file mode 100644 index 058b9cf..0000000 --- a/nemo-seahorse_gpg-2.2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nemo-seahorse.orig/configure.ac -+++ nemo-seahorse/configure.ac -@@ -57,7 +57,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0 2.1" -+ accepted_versions="1.2 1.4 2.0 2.1 2.2" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - ok="no" - if test "$GNUPG" != "no"; then diff --git a/nemo-seahorse_no-nautilus-conflicts.patch b/nemo-seahorse_no-nautilus-conflicts.patch index 4bbc83f..82ac84d 100644 --- a/nemo-seahorse_no-nautilus-conflicts.patch +++ b/nemo-seahorse_no-nautilus-conflicts.patch @@ -1,5 +1,5 @@ ---- nemo-seahorse.orig/Makefile.am -+++ nemo-seahorse/Makefile.am +--- a/nemo-seahorse/Makefile.am 2019-02-08 16:11:14.000000000 +0600 ++++ b/nemo-seahorse/Makefile.am 2019-04-26 16:01:50.487857001 +0600 @@ -1,8 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 diff --git a/nemo-share-prevent-privilege-escalation.patch b/nemo-share-prevent-privilege-escalation.patch index 956753c..e3f718c 100644 --- a/nemo-share-prevent-privilege-escalation.patch +++ b/nemo-share-prevent-privilege-escalation.patch @@ -1,13 +1,9 @@ ---- nemo-share.orig/src/install-samba -+++ nemo-share/src/install-samba -@@ -33,12 +33,20 @@ class Main: - if __name__ == "__main__": - ml = GLib.MainLoop.new(None, True) - -- if len(sys.argv) == 2: -- user = sys.argv[1] -- else: -- uid = int(os.getenv("PKEXEC_UID")) +--- a/nemo-share/src/install-samba 2019-02-08 16:11:14.000000000 +0600 ++++ b/nemo-share/src/install-samba 2019-04-29 09:16:24.571726203 +0600 +@@ -42,6 +42,15 @@ + uid = int(uid) + passwd = pwd.getpwuid(uid) + user = passwd[0] + # prefer using the uid provided by pkexec to the command line argument. if + # a user authenticated via pkexec then he should only be able to add + # himself to the group. @@ -15,14 +11,8 @@ + + if uid != None: + uid = int(uid) - passwd = pwd.getpwuid(uid) - user = passwd[0] -+ elif len(sys.argv) == 2: -+ user = sys.argv[1] -+ else: -+ print("No target uid in environment or on command line found.") -+ exit(-1) - - main = Main(user) - ml.run() - ++ passwd = pwd.getpwuid(uid) ++ user = passwd[0] + elif len(sys.argv) == 2: + user = sys.argv[1] + else: