public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/
@ 2020-06-25 20:15 Conrad Kostecki
  0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2020-06-25 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     4c455021f8b3a3228201a1eec07e52c3fa4d2cd9
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jun 25 18:48:01 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 19:57:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c455021

sys-apps/firejail: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/16416
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-apps/firejail/files/0.9.50-contrib-fix.patch | 36 ------------------------
 1 file changed, 36 deletions(-)

diff --git a/sys-apps/firejail/files/0.9.50-contrib-fix.patch b/sys-apps/firejail/files/0.9.50-contrib-fix.patch
deleted file mode 100644
index 7192bba3480..00000000000
--- a/sys-apps/firejail/files/0.9.50-contrib-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
---- firejail-0.9.48/contrib/fix_private-bin.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fix_private-bin.py	2017-08-27 23:19:52.868481040 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- __author__ = "KOLANICH"
- __copyright__ = """This is free and unencumbered software released into the public domain.
-diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
---- firejail-0.9.48/contrib/fjclip.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjclip.py	2017-08-27 23:19:58.476562539 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
---- firejail-0.9.48/contrib/fjdisplay.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjdisplay.py	2017-08-27 23:20:01.932612762 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
---- firejail-0.9.48/contrib/fjresize.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjresize.py	2017-08-27 23:20:06.932685422 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- import fjdisplay


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/
@ 2020-08-30 17:34 Dennis Lamm
  0 siblings, 0 replies; 3+ messages in thread
From: Dennis Lamm @ 2020-08-30 17:34 UTC (permalink / raw
  To: gentoo-commits

commit:     ae4a64803b42834713fd3cfd18750f0230f82de2
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Aug 30 11:06:06 2020 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 17:33:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae4a6480

sys-apps/firejail: remove unused patch(es)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17329
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 .../firejail/files/firejail-compressed-manpages.patch   | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/sys-apps/firejail/files/firejail-compressed-manpages.patch b/sys-apps/firejail/files/firejail-compressed-manpages.patch
deleted file mode 100644
index 8a43bcac261..00000000000
--- a/sys-apps/firejail/files/firejail-compressed-manpages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9c9b93d..2eb8ab2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -141,10 +141,9 @@ endif
- 	install -m 0755 -d $(DESTDIR)/$(mandir)/man5
- 	for man in $(MANPAGES); do \
- 		rm -f $$man.gz; \
--		gzip -9n $$man; \
- 		case "$$man" in \
--			*.1) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man1/; ;; \
--			*.5) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man5/; ;; \
-+			*.1) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man1/; ;; \
-+			*.5) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man5/; ;; \
- 		esac; \
- 	done
- 	rm -f $(MANPAGES) $(MANPAGES:%=%.gz)


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/
@ 2016-09-14  9:22 Amadeusz Piotr Żołnowski
  0 siblings, 0 replies; 3+ messages in thread
From: Amadeusz Piotr Żołnowski @ 2016-09-14  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     312df027b207e1456bf8a17328bedde7444cbbf4
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 09:21:47 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 09:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312df027

sys-apps/firejail: Add missing patch for 0.9.38.2

Package-Manager: portage-2.3.0

 .../files/firejail-0.9.38.2-sysmacros.patch        | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/sys-apps/firejail/files/firejail-0.9.38.2-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.38.2-sysmacros.patch
new file mode 100644
index 00000000..85830a4
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.38.2-sysmacros.patch
@@ -0,0 +1,27 @@
+From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 20 Apr 2016 00:14:21 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+These funcs have been defined in sys/sysmacros.h forever, and Linux C
+libs are moving away from implicitly including it.  Update the files
+to include it explicitly.
+---
+ src/firejail/fs_dev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
+index 97ee9de..2f66980 100644
+--- a/src/firejail/fs_dev.c
++++ b/src/firejail/fs_dev.c
+@@ -28,6 +28,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE 
+ #endif
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
+-- 
+2.7.4
+


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-08-30 17:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-25 20:15 [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2020-08-30 17:34 Dennis Lamm
2016-09-14  9:22 Amadeusz Piotr Żołnowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox