* [ptxdist] [PATCH 1/5] ustr: move to staging
@ 2020-06-21 22:29 Roland Hieber
2020-06-21 22:29 ` [ptxdist] [PATCH 2/5] dc3dd: remove after one year in staging Roland Hieber
` (4 more replies)
0 siblings, 5 replies; 16+ messages in thread
From: Roland Hieber @ 2020-06-21 22:29 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
The download server has been down for more than one week now. The
packages was never updated since commit b4c224b6f93802ff2adf
(2013-01-07, Wolfram Sang: "ustr: add package"), and the Debian package
changelog [0] also shows no new versions since 2008.
The only user, libsemanage, is already in staging.
[0]: https://metadata.ftp-master.debian.org/changelogs//main/u/ustr/ustr_1.0.4-3_changelog
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/host-ustr.in | 7 ++++++-
rules/ustr.in | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rules/host-ustr.in b/rules/host-ustr.in
index a64b4fd3eca3..65c8c2b895b9 100644
--- a/rules/host-ustr.in
+++ b/rules/host-ustr.in
@@ -1,5 +1,10 @@
-## SECTION=hosttools_noprompt
+## SECTION=staging
+## old section:
+### SECTION=hosttools_noprompt
config HOST_USTR
tristate
default y if ALLYES
+ help
+ STAGING: remove in PTXdist 2021.07.0
+ No new versions since 2008, and fails to download.
diff --git a/rules/ustr.in b/rules/ustr.in
index 5546f564b49d..60cfe89f8dc6 100644
--- a/rules/ustr.in
+++ b/rules/ustr.in
@@ -1,4 +1,6 @@
-## SECTION=system_libraries
+## SECTION=staging
+## old section:
+### SECTION=system_libraries
config USTR
tristate
@@ -7,3 +9,6 @@ config USTR
ustr (Micro string library) is a string API for C. It has tiny overhead over
just plain strdup(), is much safer, is easier to use, is faster for many
operations, can be used with read-only or automatically allocated data.
+
+ STAGING: remove in PTXdist 2021.07.0
+ No new versions since 2008, and fails to download.
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 2/5] dc3dd: remove after one year in staging
2020-06-21 22:29 [ptxdist] [PATCH 1/5] ustr: move to staging Roland Hieber
@ 2020-06-21 22:29 ` Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-21 22:29 ` [ptxdist] [PATCH 3/5] mono: " Roland Hieber
` (3 subsequent siblings)
4 siblings, 1 reply; 16+ messages in thread
From: Roland Hieber @ 2020-06-21 22:29 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/dc3dd.in | 16 -------------
rules/dc3dd.make | 60 ------------------------------------------------
2 files changed, 76 deletions(-)
delete mode 100644 rules/dc3dd.in
delete mode 100644 rules/dc3dd.make
diff --git a/rules/dc3dd.in b/rules/dc3dd.in
deleted file mode 100644
index e2d57688a590..000000000000
--- a/rules/dc3dd.in
+++ /dev/null
@@ -1,16 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=disk_and_file
-
-config DC3DD
- tristate
- select LIBC_PTHREAD
- select LIBC
- prompt "dc3dd"
- help
- dc3dd is a patched version of GNU dd with added features for computer forensics.
- It was developed at the DoD Cyber Crime Center by Jesse Kornblum.
- See https://tools.kali.org/forensics/dc3dd for usage.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that need to be updated. Fails to build with glibc-2.28.
diff --git a/rules/dc3dd.make b/rules/dc3dd.make
deleted file mode 100644
index 7c7b03aaaaac..000000000000
--- a/rules/dc3dd.make
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2016 by Thorsten Liepert
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-PACKAGES-$(PTXCONF_DC3DD) += dc3dd
-
-DC3DD_VERSION := 7.2.641
-DC3DD_MD5 := 63987a467310d7b8a5102cb33e1945f4
-DC3DD := dc3dd-$(DC3DD_VERSION)
-DC3DD_SUFFIX := tar.xz
-DC3DD_URL := $(call ptx/mirror, SF, dc3dd/7.2/dc3dd-$(DC3DD_VERSION).$(DC3DD_SUFFIX))
-DC3DD_SOURCE := $(SRCDIR)/$(DC3DD).$(DC3DD_SUFFIX)
-DC3DD_DIR := $(BUILDDIR)/$(DC3DD)
-DC3DD_LICENSE := GPL-3.0-or-later
-DC3DD_LICENSE_FILES := file://COPYING;md5=d32239bcb673463ab874e80d47fae504
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-DC3DD_CONF_ENV := \
- $(CROSS_ENV) \
- PERL=
-
-DC3DD_CONF_TOOL := autoconf
-DC3DD_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --enable-dependency-tracking \
- --disable-assert \
- --disable-rpath \
- --disable-hdparm \
- --disable-nls \
- --without-included-regex \
- --with-gnu-ld
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/dc3dd.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, dc3dd)
- @$(call install_fixup, dc3dd,PRIORITY,optional)
- @$(call install_fixup, dc3dd,SECTION,base)
- @$(call install_fixup, dc3dd,AUTHOR,"Thorsten Liepert <thorsten.liepert@diehl.com>")
- @$(call install_fixup, dc3dd,DESCRIPTION,missing)
-
- @$(call install_copy, dc3dd, 0, 0, 0755, -, /usr/bin/dc3dd)
-
- @$(call install_finish, dc3dd)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 3/5] mono: remove after one year in staging
2020-06-21 22:29 [ptxdist] [PATCH 1/5] ustr: move to staging Roland Hieber
2020-06-21 22:29 ` [ptxdist] [PATCH 2/5] dc3dd: remove after one year in staging Roland Hieber
@ 2020-06-21 22:29 ` Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-21 22:29 ` [ptxdist] [PATCH 4/5] sepolgen: " Roland Hieber
` (2 subsequent siblings)
4 siblings, 1 reply; 16+ messages in thread
From: Roland Hieber @ 2020-06-21 22:29 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
...om-Kyle-Edwards-kyleedwardsny-gmail..patch | 22 ---
patches/mono-3.2.8/autogen.sh | 1 -
patches/mono-3.2.8/series | 4 -
rules/mono.in | 14 --
rules/mono.make | 153 ------------------
5 files changed, 194 deletions(-)
delete mode 100644 patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch
delete mode 120000 patches/mono-3.2.8/autogen.sh
delete mode 100644 patches/mono-3.2.8/series
delete mode 100644 rules/mono.in
delete mode 100644 rules/mono.make
diff --git a/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch b/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch
deleted file mode 100644
index c6652bcde744..000000000000
--- a/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Zoltan Varga <vargaz@gmail.com>
-Date: Tue, 3 Jun 2014 16:07:40 +0200
-Subject: [PATCH] Applied patch from Kyle Edwards <kyleedwardsny@gmail.com>.
- Fix isinf () check with clang. Fixes #20244.
-
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 493f671c2a7d..0a390788d125 100644
---- a/configure.in
-+++ b/configure.in
-@@ -475,7 +475,7 @@ AC_CHECK_HEADERS(wchar.h)
- AC_CHECK_HEADERS(ieeefp.h)
- AC_MSG_CHECKING(for isinf)
- AC_TRY_LINK([#include <math.h>], [
-- int f = isinf (1);
-+ int f = isinf (1.0);
- ], [
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_ISINF, 1, [isinf available])
diff --git a/patches/mono-3.2.8/autogen.sh b/patches/mono-3.2.8/autogen.sh
deleted file mode 120000
index 9f8a4cb7ddcb..000000000000
--- a/patches/mono-3.2.8/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/mono-3.2.8/series b/patches/mono-3.2.8/series
deleted file mode 100644
index 4c270b930294..000000000000
--- a/patches/mono-3.2.8/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch
-# d06d73e43cdc6dae035f536c6595128b - git-ptx-patches magic
diff --git a/rules/mono.in b/rules/mono.in
deleted file mode 100644
index 386616b648e0..000000000000
--- a/rules/mono.in
+++ /dev/null
@@ -1,14 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=bytecode_engines
-
-config MONO
- tristate
- select GLIB
- prompt "mono"
- help
- mono is a runtime implementation of the ECMA Common Language
- Infrastructure. It can be used to run ECMA and .NET applications.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that need to be updated. Fails to build with glibc-2.28.
diff --git a/rules/mono.make b/rules/mono.make
deleted file mode 100644
index 4c014ff05ae5..000000000000
--- a/rules/mono.make
+++ /dev/null
@@ -1,153 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2010 by Robert Schwebel <r.schwebel@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-ifndef PTXCONF_ARCH_ARM64
-PACKAGES-$(PTXCONF_MONO) += mono
-endif
-
-#
-# Paths and names
-#
-MONO_VERSION := 3.2.8
-MONO_MD5 := 1075f99bd8a69890af9e30309728e684
-MONO := mono-$(MONO_VERSION)
-MONO_SUFFIX := tar.bz2
-MONO_URL := http://download.mono-project.com/sources/mono/$(MONO).$(MONO_SUFFIX)
-MONO_SOURCE := $(SRCDIR)/$(MONO).$(MONO_SUFFIX)
-MONO_DIR := $(BUILDDIR)/$(MONO)
-MONO_LICENSE := unknown
-MONO_DEVPKG := NO
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/mono.extract:
- @$(call targetinfo)
- @$(call clean, $(MONO_DIR))
- @$(call extract, MONO)
-# # The mono archive has some stray .git files in it's externals-subdirs
- @find $(MONO_DIR) -name .git -print0 | xargs -0 rm -v
- @$(call patchin, MONO)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-MONO_CONF_ENV := \
- $(CROSS_ENV) \
- CPPFLAGS="$(CROSS_CPPFLAGS) $(call ptx/ifdef, PTXCONF_HAS_HARDFLOAT,,-DARM_FPU_NONE)" \
- mono_cv_uscore=yes
-#
-# autoconf
-#
-MONO_CONF_TOOL := autoconf
-MONO_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-solaris-tar-check \
- --disable-nls \
- --disable-mcs-build \
- --enable-silent-rules \
- --disable-parallel-mark \
- --disable-dev-random \
- --enable-shared-handles \
- --disable-nunit-tests \
- --disable-big-arrays \
- --disable-dtrace \
- --disable-llvm \
- --disable-loadedllvm \
- --disable-llvm-version-check \
- --with-libgdiplus=installed \
- --with-gc=included \
- --with-tls=pthread \
- --with-sigaltstack=no \
- --with-static_mono=no \
- --with-shared_mono=yes \
- --with-xen_opt=no \
- --with-large-heap=no \
- --with-ikvm-native=yes \
- --with-profile2=no \
- --with-profile4=no \
- --with-profile4_5=no \
- --with-monodroid=no \
- --with-monotouch=no \
- --with-mobile=no \
- --with-oprofile=no \
- --with-malloc-mempools=no \
- --with-mcs-docs=no \
- --with-lazy-gc-thread-creation=no \
- --enable-libraries \
- --enable-executables \
- --disable-extension-module \
- --disable-small-config \
- --enable-system-aot \
- --enable-boehm \
- --disable-nacl-codegen \
- --disable-nacl-gc \
- --disable-icall-symbol-map \
- --enable-icall-export \
- --disable-icall-tables \
- --with-jumptables=no \
- --with-sgen=yes
-
-# --enable-minimal=LIST drop support for LIST subsystems.
-# --with-crosspkgdir=/path/to/pkg-config/dir Change pkg-config dir to custom dir
-#
-# LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
-# appdomains, verifier, reflection_emit, reflection_emit_save, large_code,
-# logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters,
-# normalization, assembly_remapping, shared_perfcounters, remoting, security,
-# sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed,
-# sgen_marksweep_fixed_par, sgen_copying.],
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/mono.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, mono)
- @$(call install_fixup, mono,PACKAGE,mono)
- @$(call install_fixup, mono,PRIORITY,optional)
- @$(call install_fixup, mono,VERSION,$(MONO_VERSION))
- @$(call install_fixup, mono,SECTION,base)
- @$(call install_fixup, mono,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
- @$(call install_fixup, mono,DEPENDS,)
- @$(call install_fixup, mono,DESCRIPTION,missing)
-
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/machine.config)
-
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx)
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/Browsers/Compat.browser)
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx)
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/machine.config)
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/settings.map)
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/web.config)
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/browscap.ini)
- @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/config)
-
- @$(call install_tree, mono, -, -, $(MONO_PKGDIR)/usr/bin, /usr/bin)
- @$(call install_tree, mono, -, -, $(MONO_PKGDIR)/usr/lib, /usr/lib)
-
- @$(call install_copy, mono, 0, 0, 0644, -, /usr/share/mono-2.0/mono/cil/cil-opcodes.xml)
-
- # looks like we have to install this, otherwhise not even helloworld.cs does work
- @$(call install_copy, mono, 0, 0, 0755, \
- $(MONO_DIR)/mcs/class/lib/monolite/mscorlib.dll, \
- /usr/lib/mono/1.0/mscorlib.dll)
-
- @$(call install_finish, mono)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 4/5] sepolgen: remove after one year in staging
2020-06-21 22:29 [ptxdist] [PATCH 1/5] ustr: move to staging Roland Hieber
2020-06-21 22:29 ` [ptxdist] [PATCH 2/5] dc3dd: remove after one year in staging Roland Hieber
2020-06-21 22:29 ` [ptxdist] [PATCH 3/5] mono: " Roland Hieber
@ 2020-06-21 22:29 ` Roland Hieber
2020-06-22 12:26 ` Michael Olbrich
2020-06-21 22:29 ` [ptxdist] [PATCH 5/5] udisks: " Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] ustr: move to staging Michael Olbrich
4 siblings, 1 reply; 16+ messages in thread
From: Roland Hieber @ 2020-06-21 22:29 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/policycoreutils.in | 34 -------------------------
rules/sepolgen.in | 29 ---------------------
rules/sepolgen.make | 54 ----------------------------------------
3 files changed, 117 deletions(-)
delete mode 100644 rules/sepolgen.in
delete mode 100644 rules/sepolgen.make
diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
index 856b50046d5b..27347b9f0188 100644
--- a/rules/policycoreutils.in
+++ b/rules/policycoreutils.in
@@ -11,7 +11,6 @@ menuconfig POLICYCOREUTILS
select LIBSEMANAGE
select LIBSEPOL
select DBUS_GLIB if POLICYCOREUTILS_RESTORECOND
- select SEPOLGEN if POLICYCOREUTILS_PYTHON
select BUSYBOX_FEATURE_FIND_DEPTH if BUSYBOX_FIND
select BUSYBOX_FEATURE_FIND_DELETE if BUSYBOX_FIND
select BUSYBOX_SELINUX if BUSYBOX_FIND
@@ -28,39 +27,6 @@ menuconfig POLICYCOREUTILS
if POLICYCOREUTILS
-menuconfig POLICYCOREUTILS_PYTHON
- depends on STAGING
- bool "python based tools"
-
-if POLICYCOREUTILS_PYTHON
-
-config POLICYCOREUTILS_AUDIT2ALLOW
- bool "audit2allow"
-
-config POLICYCOREUTILS_SEPOLGEN_IFGEN
- select POLICYCOREUTILS_AUDIT2ALLOW
- bool "sepolgen-ifgen"
-
-config POLICYCOREUTILS_AUDIT2WHY
- select POLICYCOREUTILS_AUDIT2ALLOW
- bool "audit2why"
-
-config POLICYCOREUTILS_SANDBOX
- bool "sandbox"
- depends on BROKEN
-
-config POLICYCOREUTILS_CHCAT
- select LIBSEMANAGE_PYTHON
- depends on BROKEN
- bool "chcat"
-
-config POLICYCOREUTILS_SEMANAGE
- select LIBSEMANAGE_PYTHON
- depends on BROKEN
- bool "semanage"
-
-endif
-
config POLICYCOREUTILS_LOAD_POLICY
bool "load_policy"
diff --git a/rules/sepolgen.in b/rules/sepolgen.in
deleted file mode 100644
index 94f2ce071ab8..000000000000
--- a/rules/sepolgen.in
+++ /dev/null
@@ -1,29 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=selinux
-
-config SEPOLGEN
- tristate
- prompt "sepolgen"
- select PYTHON
- select LIBSELINUX
- select LIBSELINUX_PYTHON
- help
- A Python module used in SELinux policy generation
-
- This package contains a Python module that forms the core of
- the modern audit2allow (which is a part of the package
- policycoreutils). The sepolgen library is structured to give
- flexibility to the application using it. The library
- contains: Reference Policy Representation, which are Objects
- for representing policies and the reference policy
- interfaces. Secondly, it has objects and algorithms for
- representing access and sets of access in an abstract way
- and searching that access. It also has a parser for
- reference policy "headers". It contains infrastructure for
- parsing SELinux related messages as produced by the audit
- system. It has facilities for generating policy based on
- required access.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that needs to be updated.
diff --git a/rules/sepolgen.make b/rules/sepolgen.make
deleted file mode 100644
index 7084e1d1d348..000000000000
--- a/rules/sepolgen.make
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen
-
-#
-# Paths and names
-#
-SEPOLGEN_VERSION := 1.1.8
-SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d
-SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION)
-SEPOLGEN_SUFFIX := tar.gz
-SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
-SEPOLGEN_SOURCE := $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
-SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN)
-SEPOLGEN_LICENSE := GPL-2.0-only
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-SEPOLGEN_CONF_TOOL := NO
-# no ':=' because of $(PYTHON_SITEPACKAGES)
-SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/sepolgen.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, sepolgen)
- @$(call install_fixup, sepolgen,PRIORITY,optional)
- @$(call install_fixup, sepolgen,SECTION,base)
- @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
- @$(call install_fixup, sepolgen,DESCRIPTION,missing)
-
- @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES))
- @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map)
-
- @$(call install_finish, sepolgen)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH 5/5] udisks: remove after one year in staging
2020-06-21 22:29 [ptxdist] [PATCH 1/5] ustr: move to staging Roland Hieber
` (2 preceding siblings ...)
2020-06-21 22:29 ` [ptxdist] [PATCH 4/5] sepolgen: " Roland Hieber
@ 2020-06-21 22:29 ` Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-26 11:00 ` [ptxdist] [APPLIED] ustr: move to staging Michael Olbrich
4 siblings, 1 reply; 16+ messages in thread
From: Roland Hieber @ 2020-06-21 22:29 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
patches/udisks-1.0.0/autogen.sh | 1 -
patches/udisks-1.0.0/devmapper-optional.diff | 58 ---
patches/udisks-1.0.0/libparted-optional.diff | 90 ----
patches/udisks-1.0.0/libsgutils-optional.diff | 68 ---
patches/udisks-1.0.0/series | 4 -
patches/udisks-1.0.0/smart-optional.diff | 415 ------------------
rules/udisks.in | 54 ---
rules/udisks.make | 117 -----
8 files changed, 807 deletions(-)
delete mode 120000 patches/udisks-1.0.0/autogen.sh
delete mode 100644 patches/udisks-1.0.0/devmapper-optional.diff
delete mode 100644 patches/udisks-1.0.0/libparted-optional.diff
delete mode 100644 patches/udisks-1.0.0/libsgutils-optional.diff
delete mode 100644 patches/udisks-1.0.0/series
delete mode 100644 patches/udisks-1.0.0/smart-optional.diff
delete mode 100644 rules/udisks.in
delete mode 100644 rules/udisks.make
diff --git a/patches/udisks-1.0.0/autogen.sh b/patches/udisks-1.0.0/autogen.sh
deleted file mode 120000
index 9f8a4cb7ddcb..000000000000
--- a/patches/udisks-1.0.0/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/udisks-1.0.0/devmapper-optional.diff b/patches/udisks-1.0.0/devmapper-optional.diff
deleted file mode 100644
index 3a7a3368b820..000000000000
--- a/patches/udisks-1.0.0/devmapper-optional.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make devmapper dependency optional
-
-This patch adds a configure option for devmapper.
-When disabled, the helper program using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 11 ++++++++---
- src/probers/Makefile.am | 5 ++++-
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -173,9 +173,14 @@ if test "x$enable_libparted" = xyes; the
- fi
- AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
-
--PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
--AC_SUBST(DEVMAPPER_CFLAGS)
--AC_SUBST(DEVMAPPER_LIBS)
-+AC_ARG_ENABLE(devmapper,[ --disable-devmapper],enable_devmapper=$enableval,enable_devmapper=yes)
-+
-+if test "x$enable_devmapper" = xyes; then
-+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
-+ AC_SUBST(DEVMAPPER_CFLAGS)
-+ AC_SUBST(DEVMAPPER_LIBS)
-+fi
-+AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes)
-
- have_lvm2=no
- AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support]))
-Index: b/src/probers/Makefile.am
-===================================================================
---- a/src/probers/Makefile.am
-+++ b/src/probers/Makefile.am
-@@ -22,7 +22,6 @@ INCLUDES = \
-
- udevhelperdir = $(slashlibdir)/udev
- udevhelper_PROGRAMS = \
-- udisks-dm-export \
- udisks-probe-ata-smart \
- udisks-probe-sas-expander \
- $(NULL)
-@@ -31,6 +30,10 @@ if LIBPARTED_ENABLED
- udevhelper_PROGRAMS += udisks-part-id
- endif
-
-+if DEVMAPPER_ENABLED
-+udevhelper_PROGRAMS += udisks-dm-export
-+endif
-+
- if HAVE_LVM2
- udevhelper_PROGRAMS += udisks-lvm-pv-export
- endif
diff --git a/patches/udisks-1.0.0/libparted-optional.diff b/patches/udisks-1.0.0/libparted-optional.diff
deleted file mode 100644
index e5027ccf17d3..000000000000
--- a/patches/udisks-1.0.0/libparted-optional.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make libparted dependency optional
-
-This patch adds a configure option for libparted.
-When disabled, the helper programs using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 11 ++++++++---
- src/helpers/Makefile.am | 13 +++++++++----
- src/probers/Makefile.am | 6 +++++-
- 3 files changed, 22 insertions(+), 8 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -164,9 +164,14 @@ PKG_CHECK_MODULES(POLKIT_BACKEND_1, [pol
- AC_SUBST(POLKIT_BACKEND_1_CFLAGS)
- AC_SUBST(POLKIT_BACKEND_1_LIBS)
-
--PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
--AC_SUBST(LIBPARTED_CFLAGS)
--AC_SUBST(LIBPARTED_LIBS)
-+AC_ARG_ENABLE(libparted,[ --disable-libparted],enable_libparted=$enableval,enable_libparted=yes)
-+
-+if test "x$enable_libparted" = xyes; then
-+ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
-+ AC_SUBST(LIBPARTED_CFLAGS)
-+ AC_SUBST(LIBPARTED_LIBS)
-+fi
-+AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
-
- PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
- AC_SUBST(DEVMAPPER_CFLAGS)
-Index: b/src/helpers/Makefile.am
-===================================================================
---- a/src/helpers/Makefile.am
-+++ b/src/helpers/Makefile.am
-@@ -19,10 +19,6 @@ INCLUDES = \
-
- libexec_PROGRAMS = \
- udisks-helper-mkfs \
-- udisks-helper-delete-partition \
-- udisks-helper-create-partition \
-- udisks-helper-modify-partition \
-- udisks-helper-create-partition-table \
- udisks-helper-change-filesystem-label \
- udisks-helper-linux-md-remove-component \
- udisks-helper-fstab-mounter \
-@@ -37,7 +33,16 @@ if SGUTILS2_ENABLED
- libexec_PROGRAMS += udisks-helper-drive-detach
- endif
-
-+if LIBPARTED_ENABLED
-+libexec_PROGRAMS += \
-+ udisks-helper-delete-partition \
-+ udisks-helper-create-partition \
-+ udisks-helper-modify-partition \
-+ udisks-helper-create-partition-table \
-+ $(NULL)
-+
- noinst_LTLIBRARIES = libpartutil.la
-+endif
- libpartutil_la_SOURCES = partutil.h partutil.c
- libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
- libpartutil_la_LIBADD = $(LIBPARTED_LIBS)
-Index: b/src/probers/Makefile.am
-===================================================================
---- a/src/probers/Makefile.am
-+++ b/src/probers/Makefile.am
-@@ -21,12 +21,16 @@ INCLUDES = \
- #
-
- udevhelperdir = $(slashlibdir)/udev
--udevhelper_PROGRAMS = udisks-part-id \
-+udevhelper_PROGRAMS = \
- udisks-dm-export \
- udisks-probe-ata-smart \
- udisks-probe-sas-expander \
- $(NULL)
-
-+if LIBPARTED_ENABLED
-+udevhelper_PROGRAMS += udisks-part-id
-+endif
-+
- if HAVE_LVM2
- udevhelper_PROGRAMS += udisks-lvm-pv-export
- endif
diff --git a/patches/udisks-1.0.0/libsgutils-optional.diff b/patches/udisks-1.0.0/libsgutils-optional.diff
deleted file mode 100644
index 75ee410806a5..000000000000
--- a/patches/udisks-1.0.0/libsgutils-optional.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make sgutils2 dependency optional
-
-This patch adds a configure option for sgutils2.
-When disabled, the helper program using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 23 ++++++++++++++---------
- src/helpers/Makefile.am | 5 ++++-
- 2 files changed, 18 insertions(+), 10 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -120,15 +120,20 @@ if test "x$GCC" = "xyes"; then
- changequote([,])dnl
- fi
-
--have_sgutils="false"
--AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
--if test x$have_sgutils != "xtrue"; then
-- AC_MSG_ERROR([libsgutils2 is needed])
--fi
--SGUTILS_CFLAGS=""
--SGUTILS_LIBS="-lsgutils2"
--AC_SUBST(SGUTILS_CFLAGS)
--AC_SUBST(SGUTILS_LIBS)
-+AC_ARG_ENABLE(sgutils2, [ --disable-sgutils2],enable_sgutils2=$enableval,enable_sgutils2=yes)
-+
-+if test "x$enable_sgutils2" = xyes; then
-+ have_sgutils="false"
-+ AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
-+ if test x$have_sgutils != "xtrue"; then
-+ AC_MSG_ERROR([libsgutils2 is needed])
-+ fi
-+ SGUTILS_CFLAGS=""
-+ SGUTILS_LIBS="-lsgutils2"
-+ AC_SUBST(SGUTILS_CFLAGS)
-+ AC_SUBST(SGUTILS_LIBS)
-+fi
-+AM_CONDITIONAL(SGUTILS2_ENABLED, test "x$enable_sgutils2" = xyes)
-
-
- PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 147])
-Index: b/src/helpers/Makefile.am
-===================================================================
---- a/src/helpers/Makefile.am
-+++ b/src/helpers/Makefile.am
-@@ -28,12 +28,15 @@ libexec_PROGRAMS = \
- udisks-helper-fstab-mounter \
- udisks-helper-ata-smart-collect \
- udisks-helper-ata-smart-selftest \
-- udisks-helper-drive-detach \
- udisks-helper-drive-poll \
- udisks-helper-linux-md-check \
- udisks-helper-drive-benchmark \
- $(NULL)
-
-+if SGUTILS2_ENABLED
-+libexec_PROGRAMS += udisks-helper-drive-detach
-+endif
-+
- noinst_LTLIBRARIES = libpartutil.la
- libpartutil_la_SOURCES = partutil.h partutil.c
- libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
diff --git a/patches/udisks-1.0.0/series b/patches/udisks-1.0.0/series
deleted file mode 100644
index e490966aa3a3..000000000000
--- a/patches/udisks-1.0.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-libsgutils-optional.diff
-libparted-optional.diff
-devmapper-optional.diff
-smart-optional.diff
diff --git a/patches/udisks-1.0.0/smart-optional.diff b/patches/udisks-1.0.0/smart-optional.diff
deleted file mode 100644
index a5e405cd21df..000000000000
--- a/patches/udisks-1.0.0/smart-optional.diff
+++ /dev/null
@@ -1,415 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make libatasmart dependency optional
-
-This patch adds a configure option for libatasmart.
-When disabled, the helper programs using it will not be built.
-Any other code using libatasmart is guarded with appropriate ifdefs.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 12 +++++++++---
- src/adapter-private.h | 1 -
- src/adapter.c | 1 -
- src/daemon.c | 4 ++++
- src/device-private.c | 2 ++
- src/device-private.h | 6 ++++++
- src/device.c | 20 ++++++++++++++++++++
- src/expander-private.h | 1 -
- src/expander.c | 1 -
- src/helpers/Makefile.am | 9 +++++++--
- src/port-private.h | 1 -
- src/probers/Makefile.am | 5 ++++-
- tools/udisks.c | 6 ++++++
- 13 files changed, 58 insertions(+), 11 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -204,9 +204,15 @@ if test "x$enable_dmmp" != "xno"; then
- fi
- AM_CONDITIONAL(HAVE_DMMP, [test "$have_dmmp" = "yes"])
-
--PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
--AC_SUBST(LIBATASMART_CFLAGS)
--AC_SUBST(LIBATASMART_LIBS)
-+AC_ARG_ENABLE(libatasmart,[ --disable-libatasmart],enable_libatasmart=$enableval,enable_libatasmart=yes)
-+
-+if test "x$enable_libatasmart" = xyes; then
-+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
-+ AC_SUBST(LIBATASMART_CFLAGS)
-+ AC_SUBST(LIBATASMART_LIBS)
-+ AC_DEFINE(LIBATASMART_ENABLED,[1],[libatasmart enabled])
-+fi
-+AM_CONDITIONAL(LIBATASMART_ENABLED, test "x$enable_libatasmart" = xyes)
-
- PKG_CHECK_MODULES(LIBUDEV, [libudev >= 143])
- AC_SUBST(LIBUDEV_CFLAGS)
-Index: b/src/device-private.h
-===================================================================
---- a/src/device-private.h
-+++ b/src/device-private.h
-@@ -23,7 +23,9 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "types.h"
-
-@@ -224,7 +226,9 @@ struct DevicePrivate
-
- gboolean drive_ata_smart_is_available;
- guint64 drive_ata_smart_time_collected;
-+#ifdef LIBATASMART_ENABLED
- SkSmartOverall drive_ata_smart_status;
-+#endif
- void *drive_ata_smart_blob;
- gsize drive_ata_smart_blob_size;
-
-@@ -389,10 +393,12 @@ void device_set_dm_name (Device *device,
- void device_set_slaves_objpath (Device *device, GStrv value);
- void device_set_holders_objpath (Device *device, GStrv value);
-
-+#ifdef LIBATASMART_ENABLED
- void device_set_drive_ata_smart_is_available (Device *device, gboolean value);
- void device_set_drive_ata_smart_time_collected (Device *device, guint64 value);
- void device_set_drive_ata_smart_status (Device *device, SkSmartOverall value);
- void device_set_drive_ata_smart_blob_steal (Device *device, gchar *blob, gsize blob_size);
-+#endif
-
- G_END_DECLS
-
-Index: b/src/device.c
-===================================================================
---- a/src/device.c
-+++ b/src/device.c
-@@ -49,7 +49,9 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <gudev/gudev.h>
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "daemon.h"
- #include "device.h"
-@@ -658,6 +660,7 @@ get_property (GObject *object,
- case PROP_DRIVE_ATA_SMART_TIME_COLLECTED:
- g_value_set_uint64 (value, device->priv->drive_ata_smart_time_collected);
- break;
-+#ifdef LIBATASMART_ENABLED
- case PROP_DRIVE_ATA_SMART_STATUS:
- {
- const gchar *status;
-@@ -668,6 +671,7 @@ get_property (GObject *object,
- g_value_set_string (value, status);
- }
- break;
-+#endif
- case PROP_DRIVE_ATA_SMART_BLOB:
- {
- GArray *a;
-@@ -1740,7 +1744,9 @@ device_init (Device *device)
- device->priv->slaves_objpath = g_ptr_array_new ();
- device->priv->holders_objpath = g_ptr_array_new ();
-
-+#ifdef LIBATASMART_ENABLED
- device->priv->drive_ata_smart_status = -1;
-+#endif
- }
-
- static void
-@@ -3830,6 +3836,7 @@ update_info_linux_md (Device *device)
- static gboolean
- update_info_drive_ata_smart (Device *device)
- {
-+#ifdef LIBATASMART_ENABLED
- gboolean ata_smart_is_available;
-
- ata_smart_is_available = FALSE;
-@@ -3842,6 +3849,7 @@ update_info_drive_ata_smart (Device *dev
- * collecting data is done in separate routines, see the
- * device_drive_ata_smart_refresh_data() function for details.
- */
-+#endif
-
- return TRUE;
- }
-@@ -9646,6 +9654,7 @@ device_filesystem_set_label (Device *dev
-
- /*--------------------------------------------------------------------------------------------------------------*/
-
-+#ifdef LIBATASMART_ENABLED
- /* may be called with context==NULL */
- static void
- drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context,
-@@ -9848,6 +9857,7 @@ device_drive_ata_smart_refresh_data_auth
- ;
- PROFILE ("device_drive_ata_smart_refresh_data_authorized_cb(device=%s) end", device->priv->native_path);
- }
-+#endif /* LIBATASMART_ENABLED */
-
- /* may be called with context==NULL */
- gboolean
-@@ -9855,6 +9865,7 @@ device_drive_ata_smart_refresh_data (Dev
- char **options,
- DBusGMethodInvocation *context)
- {
-+#ifdef LIBATASMART_ENABLED
- const gchar *action_id;
-
- action_id = NULL;
-@@ -9875,10 +9886,14 @@ device_drive_ata_smart_refresh_data (Dev
- g_strfreev);
-
- return TRUE;
-+#else
-+ return FALSE;
-+#endif
- }
-
- /*--------------------------------------------------------------------------------------------------------------*/
-
-+#ifdef LIBATASMART_ENABLED
- static void
- drive_ata_smart_initiate_selftest_completed_cb (DBusGMethodInvocation *context,
- Device *device,
-@@ -9975,6 +9990,7 @@ device_drive_ata_smart_initiate_selftest
- out:
- ;
- }
-+#endif /* LIBATASMART_ENABLED */
-
- gboolean
- device_drive_ata_smart_initiate_selftest (Device *device,
-@@ -9982,6 +9998,7 @@ device_drive_ata_smart_initiate_selftest
- gchar **options,
- DBusGMethodInvocation *context)
- {
-+#ifdef LIBATASMART_ENABLED
- if (!device->priv->drive_ata_smart_is_available)
- {
- throw_error (context, ERROR_FAILED, "Device does not support ATA SMART");
-@@ -10003,6 +10020,9 @@ device_drive_ata_smart_initiate_selftest
-
- out:
- return TRUE;
-+#else
-+ return FALSE;
-+#endif
- }
-
- /*--------------------------------------------------------------------------------------------------------------*/
-Index: b/src/device-private.c
-===================================================================
---- a/src/device-private.c
-+++ b/src/device-private.c
-@@ -1354,6 +1354,7 @@ device_set_holders_objpath (Device *devi
- }
- }
-
-+#ifdef LIBATASMART_ENABLED
- void
- device_set_drive_ata_smart_is_available (Device *device,
- gboolean value)
-@@ -1400,6 +1401,7 @@ device_set_drive_ata_smart_blob_steal (D
-
- emit_changed (device, "drive_ata_smart_blob");
- }
-+#endif /* LIBATASMART_ENABLED */
-
-
- void
-Index: b/tools/udisks.c
-===================================================================
---- a/tools/udisks.c
-+++ b/tools/udisks.c
-@@ -43,7 +43,9 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "udisks-daemon-glue.h"
- #include "udisks-device-glue.h"
-@@ -1003,6 +1005,7 @@ ata_smart_status_to_desc (const gchar *s
- return desc;
- }
-
-+#ifdef LIBATASMART_ENABLED
- static gchar *
- get_ata_smart_unit (guint unit,
- guint64 pretty_value)
-@@ -1137,6 +1140,7 @@ print_ata_smart_attr (SkDisk *d,
- g_free (threshold_str);
- g_free (pretty);
- }
-+#endif
-
- static void
- do_show_info (const char *object_path)
-@@ -1419,6 +1423,7 @@ do_show_info (const char *object_path)
-
- /* ------------------------------------------------------------------------------------------------- */
-
-+#ifdef LIBATASMART_ENABLED
- if (!props->drive_ata_smart_is_available)
- {
- g_print (" ATA SMART: not available\n");
-@@ -1471,6 +1476,7 @@ do_show_info (const char *object_path)
- }
-
- }
-+#endif
-
- /* ------------------------------------------------------------------------------------------------- */
-
-Index: b/src/helpers/Makefile.am
-===================================================================
---- a/src/helpers/Makefile.am
-+++ b/src/helpers/Makefile.am
-@@ -22,13 +22,18 @@ libexec_PROGRAMS = \
- udisks-helper-change-filesystem-label \
- udisks-helper-linux-md-remove-component \
- udisks-helper-fstab-mounter \
-- udisks-helper-ata-smart-collect \
-- udisks-helper-ata-smart-selftest \
- udisks-helper-drive-poll \
- udisks-helper-linux-md-check \
- udisks-helper-drive-benchmark \
- $(NULL)
-
-+if LIBATASMART_ENABLED
-+libexec_PROGRAMS += \
-+ udisks-helper-ata-smart-collect \
-+ udisks-helper-ata-smart-selftest \
-+ $(NULL)
-+endif
-+
- if SGUTILS2_ENABLED
- libexec_PROGRAMS += udisks-helper-drive-detach
- endif
-Index: b/src/probers/Makefile.am
-===================================================================
---- a/src/probers/Makefile.am
-+++ b/src/probers/Makefile.am
-@@ -22,7 +22,6 @@ INCLUDES = \
-
- udevhelperdir = $(slashlibdir)/udev
- udevhelper_PROGRAMS = \
-- udisks-probe-ata-smart \
- udisks-probe-sas-expander \
- $(NULL)
-
-@@ -38,6 +37,10 @@ if HAVE_LVM2
- udevhelper_PROGRAMS += udisks-lvm-pv-export
- endif
-
-+if LIBATASMART_ENABLED
-+udevhelper_PROGRAMS += udisks-probe-ata-smart
-+endif
-+
- udisks_part_id_SOURCES = part-id.c
- udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
- udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) $(top_builddir)/src/helpers/libpartutil.la
-Index: b/src/adapter-private.h
-===================================================================
---- a/src/adapter-private.h
-+++ b/src/adapter-private.h
-@@ -23,7 +23,6 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
-
- #include "types.h"
-
-Index: b/src/expander-private.h
-===================================================================
---- a/src/expander-private.h
-+++ b/src/expander-private.h
-@@ -23,7 +23,6 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
-
- #include "types.h"
-
-Index: b/src/port-private.h
-===================================================================
---- a/src/port-private.h
-+++ b/src/port-private.h
-@@ -23,7 +23,6 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
-
- #include "types.h"
-
-Index: b/src/adapter.c
-===================================================================
---- a/src/adapter.c
-+++ b/src/adapter.c
-@@ -30,7 +30,6 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
-
- #include "daemon.h"
- #include "adapter.h"
-Index: b/src/daemon.c
-===================================================================
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -1719,6 +1719,7 @@ mdstat_changed_event (GIOChannel *channe
- return TRUE;
- }
-
-+#ifdef LIBATASMART_ENABLED
- static gboolean
- refresh_ata_smart_data (Daemon *daemon)
- {
-@@ -1747,6 +1748,7 @@ refresh_ata_smart_data (Daemon *daemon)
-
- return FALSE;
- }
-+#endif /* LIBATASMART_ENABLED */
-
- static gboolean
- register_disks_daemon (Daemon *daemon)
-@@ -1949,12 +1951,14 @@ daemon_new (void)
- mount_file_clean_stale (l);
- g_list_free (l);
-
-+#ifdef LIBATASMART_ENABLED
- /* set up timer for refreshing ATA SMART data - we don't want to refresh immediately because
- * when adding a device we also do this...
- */
- daemon->priv->ata_smart_refresh_timer_id = g_timeout_add_seconds (ATA_SMART_REFRESH_INTERVAL_SECONDS,
- (GSourceFunc) refresh_ata_smart_data,
- daemon);
-+#endif /* LIBATASMART_ENABLED */
-
- PROFILE ("daemon_new(): end");
- return daemon;
-Index: b/src/expander.c
-===================================================================
---- a/src/expander.c
-+++ b/src/expander.c
-@@ -34,7 +34,6 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
- #include <stdlib.h>
-
- #include "daemon.h"
diff --git a/rules/udisks.in b/rules/udisks.in
deleted file mode 100644
index e855c1c66179..000000000000
--- a/rules/udisks.in
+++ /dev/null
@@ -1,54 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=shell_and_console
-
-comment "udisks conflicts with BusyBox' mount!"
- depends on BUSYBOX_MOUNT
-
-comment "udisks conflicts with BusyBox' umount!"
- depends on BUSYBOX_MOUNT
-
-menuconfig UDISKS
- tristate
- select HOST_GTK_DOC
- select HOST_LIBXSLT
- select GLIB
- select DBUS
- select DBUS_GLIB
- select POLKIT
- select UDEV
- select UDEV_LIBUDEV
- select LIBGUDEV
- # busybox mount can't handle all the options
- depends on !BUSYBOX_MOUNT || ALLYES
- depends on !BUSYBOX_UMOUNT || ALLYES
- select UTIL_LINUX_NG
- select UTIL_LINUX_NG_MOUNT
- select UTIL_LINUX_NG_UMOUNT
- select FAKE_OVERLAYFS if UDISKS_FAKE_OVERLAYFS
- select FAKE_OVERLAYFS_VAR_TMP if UDISKS_FAKE_OVERLAYFS && !FAKE_OVERLAYFS_VAR
- prompt "udisks "
- help
- abstraction for enumerating block devices
-
- Udisks is an abstraction for enumerating block
- devices and performing operations on them. Any application
- can access the org.freedesktop.UDisks. Disks service on
- the system message bus. Some operations (such as formatting
- disks etc.) are restricted using PolicyKit.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that need to be updated. Fails to build with glibc-2.28.
-
-if UDISKS
-
-config UDISKS_FAKE_OVERLAYFS
- bool
- prompt "use fake overlayfs"
- help
- This makes sure that all necessary directories and files
- are available and writeable on a readonly rootfs + tmpfs for
- writable directories.
-
-endif
-
diff --git a/rules/udisks.make b/rules/udisks.make
deleted file mode 100644
index 93bde262cbbb..000000000000
--- a/rules/udisks.make
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_UDISKS) += udisks
-
-#
-# Paths and names
-#
-UDISKS_VERSION := 1.0.0
-UDISKS_MD5 := a33fac347956e015f40e56a86d63f8ff
-UDISKS := udisks-$(UDISKS_VERSION)
-UDISKS_SUFFIX := tar.gz
-UDISKS_URL := http://hal.freedesktop.org/releases/$(UDISKS).$(UDISKS_SUFFIX)
-UDISKS_SOURCE := $(SRCDIR)/$(UDISKS).$(UDISKS_SUFFIX)
-UDISKS_DIR := $(BUILDDIR)/$(UDISKS)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-UDISKS_AUTOCONF := \
- $(CROSS_AUTOCONF_USR) \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --enable-shared \
- --enable-static \
- --disable-ansi \
- --disable-man-pages \
- --disable-gtk-doc \
- --enable-gtk-doc-html \
- --enable-gtk-doc-pdf \
- --with-gnu-ld \
- --disable-sgutils2 \
- --disable-libparted \
- --disable-devmapper \
- --disable-libatasmart
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/udisks.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, udisks)
- @$(call install_fixup, udisks,PRIORITY,optional)
- @$(call install_fixup, udisks,SECTION,base)
- @$(call install_fixup, udisks,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
- @$(call install_fixup, udisks,DESCRIPTION,missing)
-
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/bin/udisks)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /sbin/umount.udisks)
-
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-daemon)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-change-filesystem-label)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-change-luks-password)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-drive-poll)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-fstab-mounter)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-linux-md-check)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-linux-md-remove-component)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-mkfs)
-
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /lib/udev/rules.d/80-udisks.rules)
-
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /etc/dbus-1/system.d/org.freedesktop.UDisks.conf)
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml)
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml)
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/share/dbus-1/system-services/org.freedesktop.UDisks.service)
-
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/share/polkit-1/actions/org.freedesktop.udisks.policy)
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/lib/polkit-1/extensions/libudisks-action-lookup.so)
-
-ifdef PTXCONF_UDISKS_FAKE_OVERLAYFS
- @$(call install_copy, udisks, 0, 0, 0755, /var/tmp/media)
- @$(call install_link, udisks, var/tmp/media, /media)
- @$(call install_link, udisks, ../tmp/udisks, \
- /var/lib/udisks)
- @$(call install_copy, udisks, 0, 0, 0755, \
- /var/tmp/udisks)
-else
- @$(call install_copy, udisks, 0, 0, 0755, /media)
- @$(call install_copy, udisks, 0, 0, 0755, \
- /var/lib/udisks)
-endif
-
- @$(call install_finish, udisks)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [PATCH 4/5] sepolgen: remove after one year in staging
2020-06-21 22:29 ` [ptxdist] [PATCH 4/5] sepolgen: " Roland Hieber
@ 2020-06-22 12:26 ` Michael Olbrich
2020-06-22 12:56 ` Ladislav Michl
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Michael Olbrich @ 2020-06-22 12:26 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
On Mon, Jun 22, 2020 at 12:29:52AM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> rules/policycoreutils.in | 34 -------------------------
> rules/sepolgen.in | 29 ---------------------
> rules/sepolgen.make | 54 ----------------------------------------
> 3 files changed, 117 deletions(-)
> delete mode 100644 rules/sepolgen.in
> delete mode 100644 rules/sepolgen.make
>
> diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
> index 856b50046d5b..27347b9f0188 100644
> --- a/rules/policycoreutils.in
> +++ b/rules/policycoreutils.in
> @@ -11,7 +11,6 @@ menuconfig POLICYCOREUTILS
> select LIBSEMANAGE
> select LIBSEPOL
> select DBUS_GLIB if POLICYCOREUTILS_RESTORECOND
> - select SEPOLGEN if POLICYCOREUTILS_PYTHON
> select BUSYBOX_FEATURE_FIND_DEPTH if BUSYBOX_FIND
> select BUSYBOX_FEATURE_FIND_DELETE if BUSYBOX_FIND
> select BUSYBOX_SELINUX if BUSYBOX_FIND
> @@ -28,39 +27,6 @@ menuconfig POLICYCOREUTILS
>
> if POLICYCOREUTILS
>
> -menuconfig POLICYCOREUTILS_PYTHON
> - depends on STAGING
Keep the options and replace STAGING with BROKEN and add a comment what's
missing. The options are still referenced in the policycoreutils.make.
Michael
> - bool "python based tools"
> -
> -if POLICYCOREUTILS_PYTHON
> -
> -config POLICYCOREUTILS_AUDIT2ALLOW
> - bool "audit2allow"
> -
> -config POLICYCOREUTILS_SEPOLGEN_IFGEN
> - select POLICYCOREUTILS_AUDIT2ALLOW
> - bool "sepolgen-ifgen"
> -
> -config POLICYCOREUTILS_AUDIT2WHY
> - select POLICYCOREUTILS_AUDIT2ALLOW
> - bool "audit2why"
> -
> -config POLICYCOREUTILS_SANDBOX
> - bool "sandbox"
> - depends on BROKEN
> -
> -config POLICYCOREUTILS_CHCAT
> - select LIBSEMANAGE_PYTHON
> - depends on BROKEN
> - bool "chcat"
> -
> -config POLICYCOREUTILS_SEMANAGE
> - select LIBSEMANAGE_PYTHON
> - depends on BROKEN
> - bool "semanage"
> -
> -endif
> -
> config POLICYCOREUTILS_LOAD_POLICY
> bool "load_policy"
>
> diff --git a/rules/sepolgen.in b/rules/sepolgen.in
> deleted file mode 100644
> index 94f2ce071ab8..000000000000
> --- a/rules/sepolgen.in
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=selinux
> -
> -config SEPOLGEN
> - tristate
> - prompt "sepolgen"
> - select PYTHON
> - select LIBSELINUX
> - select LIBSELINUX_PYTHON
> - help
> - A Python module used in SELinux policy generation
> -
> - This package contains a Python module that forms the core of
> - the modern audit2allow (which is a part of the package
> - policycoreutils). The sepolgen library is structured to give
> - flexibility to the application using it. The library
> - contains: Reference Policy Representation, which are Objects
> - for representing policies and the reference policy
> - interfaces. Secondly, it has objects and algorithms for
> - representing access and sets of access in an abstract way
> - and searching that access. It also has a parser for
> - reference policy "headers". It contains infrastructure for
> - parsing SELinux related messages as produced by the audit
> - system. It has facilities for generating policy based on
> - required access.
> -
> - STAGING: remove in ptxdist-2020.06.0
> - Old version that needs to be updated.
> diff --git a/rules/sepolgen.make b/rules/sepolgen.make
> deleted file mode 100644
> index 7084e1d1d348..000000000000
> --- a/rules/sepolgen.make
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen
> -
> -#
> -# Paths and names
> -#
> -SEPOLGEN_VERSION := 1.1.8
> -SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d
> -SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION)
> -SEPOLGEN_SUFFIX := tar.gz
> -SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
> -SEPOLGEN_SOURCE := $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
> -SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN)
> -SEPOLGEN_LICENSE := GPL-2.0-only
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -SEPOLGEN_CONF_TOOL := NO
> -# no ':=' because of $(PYTHON_SITEPACKAGES)
> -SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/sepolgen.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, sepolgen)
> - @$(call install_fixup, sepolgen,PRIORITY,optional)
> - @$(call install_fixup, sepolgen,SECTION,base)
> - @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
> - @$(call install_fixup, sepolgen,DESCRIPTION,missing)
> -
> - @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES))
> - @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map)
> -
> - @$(call install_finish, sepolgen)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
> --
> 2.27.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [PATCH 4/5] sepolgen: remove after one year in staging
2020-06-22 12:26 ` Michael Olbrich
@ 2020-06-22 12:56 ` Ladislav Michl
2020-06-28 21:20 ` [ptxdist] [PATCH v2] " Roland Hieber
2020-06-28 21:24 ` [ptxdist] [PATCH v3] " Roland Hieber
2 siblings, 0 replies; 16+ messages in thread
From: Ladislav Michl @ 2020-06-22 12:56 UTC (permalink / raw)
To: ptxdist, Roland Hieber
On Mon, Jun 22, 2020 at 02:26:44PM +0200, Michael Olbrich wrote:
> On Mon, Jun 22, 2020 at 12:29:52AM +0200, Roland Hieber wrote:
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> > rules/policycoreutils.in | 34 -------------------------
> > rules/sepolgen.in | 29 ---------------------
> > rules/sepolgen.make | 54 ----------------------------------------
> > 3 files changed, 117 deletions(-)
> > delete mode 100644 rules/sepolgen.in
> > delete mode 100644 rules/sepolgen.make
> >
> > diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
> > index 856b50046d5b..27347b9f0188 100644
> > --- a/rules/policycoreutils.in
> > +++ b/rules/policycoreutils.in
> > @@ -11,7 +11,6 @@ menuconfig POLICYCOREUTILS
> > select LIBSEMANAGE
> > select LIBSEPOL
> > select DBUS_GLIB if POLICYCOREUTILS_RESTORECOND
> > - select SEPOLGEN if POLICYCOREUTILS_PYTHON
> > select BUSYBOX_FEATURE_FIND_DEPTH if BUSYBOX_FIND
> > select BUSYBOX_FEATURE_FIND_DELETE if BUSYBOX_FIND
> > select BUSYBOX_SELINUX if BUSYBOX_FIND
> > @@ -28,39 +27,6 @@ menuconfig POLICYCOREUTILS
> >
> > if POLICYCOREUTILS
> >
> > -menuconfig POLICYCOREUTILS_PYTHON
> > - depends on STAGING
>
> Keep the options and replace STAGING with BROKEN and add a comment what's
> missing. The options are still referenced in the policycoreutils.make.
...and I have some selinux resurrection patches in progress, but
unfortunately customer stepped away from that requirement.
I'll try to find time to polish them and relase in case anybody
is in the mood of finishng that job ;-)
ladis
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] ustr: move to staging
2020-06-21 22:29 [ptxdist] [PATCH 1/5] ustr: move to staging Roland Hieber
` (3 preceding siblings ...)
2020-06-21 22:29 ` [ptxdist] [PATCH 5/5] udisks: " Roland Hieber
@ 2020-06-26 11:00 ` Michael Olbrich
4 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2020-06-26 11:00 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as ae2f877d5096160753c7888127f8bba97253e903.
Michael
[sent from post-receive hook]
On Fri, 26 Jun 2020 13:00:50 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> The download server has been down for more than one week now. The
> packages was never updated since commit b4c224b6f93802ff2adf
> (2013-01-07, Wolfram Sang: "ustr: add package"), and the Debian package
> changelog [0] also shows no new versions since 2008.
>
> The only user, libsemanage, is already in staging.
>
> [0]: https://metadata.ftp-master.debian.org/changelogs//main/u/ustr/ustr_1.0.4-3_changelog
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200621222953.12596-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-ustr.in b/rules/host-ustr.in
> index a64b4fd3eca3..65c8c2b895b9 100644
> --- a/rules/host-ustr.in
> +++ b/rules/host-ustr.in
> @@ -1,5 +1,10 @@
> -## SECTION=hosttools_noprompt
> +## SECTION=staging
> +## old section:
> +### SECTION=hosttools_noprompt
>
> config HOST_USTR
> tristate
> default y if ALLYES
> + help
> + STAGING: remove in PTXdist 2021.07.0
> + No new versions since 2008, and fails to download.
> diff --git a/rules/ustr.in b/rules/ustr.in
> index 5546f564b49d..60cfe89f8dc6 100644
> --- a/rules/ustr.in
> +++ b/rules/ustr.in
> @@ -1,4 +1,6 @@
> -## SECTION=system_libraries
> +## SECTION=staging
> +## old section:
> +### SECTION=system_libraries
>
> config USTR
> tristate
> @@ -7,3 +9,6 @@ config USTR
> ustr (Micro string library) is a string API for C. It has tiny overhead over
> just plain strdup(), is much safer, is easier to use, is faster for many
> operations, can be used with read-only or automatically allocated data.
> +
> + STAGING: remove in PTXdist 2021.07.0
> + No new versions since 2008, and fails to download.
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] dc3dd: remove after one year in staging
2020-06-21 22:29 ` [ptxdist] [PATCH 2/5] dc3dd: remove after one year in staging Roland Hieber
@ 2020-06-26 11:00 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2020-06-26 11:00 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 128264bdefa8de9e895431718279ba2d71e71b83.
Michael
[sent from post-receive hook]
On Fri, 26 Jun 2020 13:00:51 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200621222953.12596-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/dc3dd.in b/rules/dc3dd.in
> deleted file mode 100644
> index e2d57688a590..000000000000
> --- a/rules/dc3dd.in
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=disk_and_file
> -
> -config DC3DD
> - tristate
> - select LIBC_PTHREAD
> - select LIBC
> - prompt "dc3dd"
> - help
> - dc3dd is a patched version of GNU dd with added features for computer forensics.
> - It was developed at the DoD Cyber Crime Center by Jesse Kornblum.
> - See https://tools.kali.org/forensics/dc3dd for usage.
> -
> - STAGING: remove in ptxdist-2020.06.0
> - Old version that need to be updated. Fails to build with glibc-2.28.
> diff --git a/rules/dc3dd.make b/rules/dc3dd.make
> deleted file mode 100644
> index 7c7b03aaaaac..000000000000
> --- a/rules/dc3dd.make
> +++ /dev/null
> @@ -1,60 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2016 by Thorsten Liepert
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -PACKAGES-$(PTXCONF_DC3DD) += dc3dd
> -
> -DC3DD_VERSION := 7.2.641
> -DC3DD_MD5 := 63987a467310d7b8a5102cb33e1945f4
> -DC3DD := dc3dd-$(DC3DD_VERSION)
> -DC3DD_SUFFIX := tar.xz
> -DC3DD_URL := $(call ptx/mirror, SF, dc3dd/7.2/dc3dd-$(DC3DD_VERSION).$(DC3DD_SUFFIX))
> -DC3DD_SOURCE := $(SRCDIR)/$(DC3DD).$(DC3DD_SUFFIX)
> -DC3DD_DIR := $(BUILDDIR)/$(DC3DD)
> -DC3DD_LICENSE := GPL-3.0-or-later
> -DC3DD_LICENSE_FILES := file://COPYING;md5=d32239bcb673463ab874e80d47fae504
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -DC3DD_CONF_ENV := \
> - $(CROSS_ENV) \
> - PERL=
> -
> -DC3DD_CONF_TOOL := autoconf
> -DC3DD_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - $(GLOBAL_LARGE_FILE_OPTION) \
> - --enable-dependency-tracking \
> - --disable-assert \
> - --disable-rpath \
> - --disable-hdparm \
> - --disable-nls \
> - --without-included-regex \
> - --with-gnu-ld
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/dc3dd.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, dc3dd)
> - @$(call install_fixup, dc3dd,PRIORITY,optional)
> - @$(call install_fixup, dc3dd,SECTION,base)
> - @$(call install_fixup, dc3dd,AUTHOR,"Thorsten Liepert <thorsten.liepert@diehl.com>")
> - @$(call install_fixup, dc3dd,DESCRIPTION,missing)
> -
> - @$(call install_copy, dc3dd, 0, 0, 0755, -, /usr/bin/dc3dd)
> -
> - @$(call install_finish, dc3dd)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] mono: remove after one year in staging
2020-06-21 22:29 ` [ptxdist] [PATCH 3/5] mono: " Roland Hieber
@ 2020-06-26 11:00 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2020-06-26 11:00 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 9d6c29779f20ef343340ace386b43a3bfc405b4c.
Michael
[sent from post-receive hook]
On Fri, 26 Jun 2020 13:00:52 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200621222953.12596-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch b/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch
> deleted file mode 100644
> index c6652bcde744..000000000000
> --- a/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -From: Zoltan Varga <vargaz@gmail.com>
> -Date: Tue, 3 Jun 2014 16:07:40 +0200
> -Subject: [PATCH] Applied patch from Kyle Edwards <kyleedwardsny@gmail.com>.
> - Fix isinf () check with clang. Fixes #20244.
> -
> ----
> - configure.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.in b/configure.in
> -index 493f671c2a7d..0a390788d125 100644
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -475,7 +475,7 @@ AC_CHECK_HEADERS(wchar.h)
> - AC_CHECK_HEADERS(ieeefp.h)
> - AC_MSG_CHECKING(for isinf)
> - AC_TRY_LINK([#include <math.h>], [
> -- int f = isinf (1);
> -+ int f = isinf (1.0);
> - ], [
> - AC_MSG_RESULT(yes)
> - AC_DEFINE(HAVE_ISINF, 1, [isinf available])
> diff --git a/patches/mono-3.2.8/autogen.sh b/patches/mono-3.2.8/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7ddcb..000000000000
> --- a/patches/mono-3.2.8/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/mono-3.2.8/series b/patches/mono-3.2.8/series
> deleted file mode 100644
> index 4c270b930294..000000000000
> --- a/patches/mono-3.2.8/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch
> -# d06d73e43cdc6dae035f536c6595128b - git-ptx-patches magic
> diff --git a/rules/mono.in b/rules/mono.in
> deleted file mode 100644
> index 386616b648e0..000000000000
> --- a/rules/mono.in
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=bytecode_engines
> -
> -config MONO
> - tristate
> - select GLIB
> - prompt "mono"
> - help
> - mono is a runtime implementation of the ECMA Common Language
> - Infrastructure. It can be used to run ECMA and .NET applications.
> -
> - STAGING: remove in ptxdist-2020.06.0
> - Old version that need to be updated. Fails to build with glibc-2.28.
> diff --git a/rules/mono.make b/rules/mono.make
> deleted file mode 100644
> index 4c014ff05ae5..000000000000
> --- a/rules/mono.make
> +++ /dev/null
> @@ -1,153 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2010 by Robert Schwebel <r.schwebel@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -ifndef PTXCONF_ARCH_ARM64
> -PACKAGES-$(PTXCONF_MONO) += mono
> -endif
> -
> -#
> -# Paths and names
> -#
> -MONO_VERSION := 3.2.8
> -MONO_MD5 := 1075f99bd8a69890af9e30309728e684
> -MONO := mono-$(MONO_VERSION)
> -MONO_SUFFIX := tar.bz2
> -MONO_URL := http://download.mono-project.com/sources/mono/$(MONO).$(MONO_SUFFIX)
> -MONO_SOURCE := $(SRCDIR)/$(MONO).$(MONO_SUFFIX)
> -MONO_DIR := $(BUILDDIR)/$(MONO)
> -MONO_LICENSE := unknown
> -MONO_DEVPKG := NO
> -
> -# ----------------------------------------------------------------------------
> -# Extract
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/mono.extract:
> - @$(call targetinfo)
> - @$(call clean, $(MONO_DIR))
> - @$(call extract, MONO)
> -# # The mono archive has some stray .git files in it's externals-subdirs
> - @find $(MONO_DIR) -name .git -print0 | xargs -0 rm -v
> - @$(call patchin, MONO)
> - @$(call touch)
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -MONO_CONF_ENV := \
> - $(CROSS_ENV) \
> - CPPFLAGS="$(CROSS_CPPFLAGS) $(call ptx/ifdef, PTXCONF_HAS_HARDFLOAT,,-DARM_FPU_NONE)" \
> - mono_cv_uscore=yes
> -#
> -# autoconf
> -#
> -MONO_CONF_TOOL := autoconf
> -MONO_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - --disable-solaris-tar-check \
> - --disable-nls \
> - --disable-mcs-build \
> - --enable-silent-rules \
> - --disable-parallel-mark \
> - --disable-dev-random \
> - --enable-shared-handles \
> - --disable-nunit-tests \
> - --disable-big-arrays \
> - --disable-dtrace \
> - --disable-llvm \
> - --disable-loadedllvm \
> - --disable-llvm-version-check \
> - --with-libgdiplus=installed \
> - --with-gc=included \
> - --with-tls=pthread \
> - --with-sigaltstack=no \
> - --with-static_mono=no \
> - --with-shared_mono=yes \
> - --with-xen_opt=no \
> - --with-large-heap=no \
> - --with-ikvm-native=yes \
> - --with-profile2=no \
> - --with-profile4=no \
> - --with-profile4_5=no \
> - --with-monodroid=no \
> - --with-monotouch=no \
> - --with-mobile=no \
> - --with-oprofile=no \
> - --with-malloc-mempools=no \
> - --with-mcs-docs=no \
> - --with-lazy-gc-thread-creation=no \
> - --enable-libraries \
> - --enable-executables \
> - --disable-extension-module \
> - --disable-small-config \
> - --enable-system-aot \
> - --enable-boehm \
> - --disable-nacl-codegen \
> - --disable-nacl-gc \
> - --disable-icall-symbol-map \
> - --enable-icall-export \
> - --disable-icall-tables \
> - --with-jumptables=no \
> - --with-sgen=yes
> -
> -# --enable-minimal=LIST drop support for LIST subsystems.
> -# --with-crosspkgdir=/path/to/pkg-config/dir Change pkg-config dir to custom dir
> -#
> -# LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
> -# appdomains, verifier, reflection_emit, reflection_emit_save, large_code,
> -# logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters,
> -# normalization, assembly_remapping, shared_perfcounters, remoting, security,
> -# sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed,
> -# sgen_marksweep_fixed_par, sgen_copying.],
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/mono.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, mono)
> - @$(call install_fixup, mono,PACKAGE,mono)
> - @$(call install_fixup, mono,PRIORITY,optional)
> - @$(call install_fixup, mono,VERSION,$(MONO_VERSION))
> - @$(call install_fixup, mono,SECTION,base)
> - @$(call install_fixup, mono,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> - @$(call install_fixup, mono,DEPENDS,)
> - @$(call install_fixup, mono,DESCRIPTION,missing)
> -
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/machine.config)
> -
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx)
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/Browsers/Compat.browser)
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx)
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/machine.config)
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/settings.map)
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/web.config)
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/browscap.ini)
> - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/config)
> -
> - @$(call install_tree, mono, -, -, $(MONO_PKGDIR)/usr/bin, /usr/bin)
> - @$(call install_tree, mono, -, -, $(MONO_PKGDIR)/usr/lib, /usr/lib)
> -
> - @$(call install_copy, mono, 0, 0, 0644, -, /usr/share/mono-2.0/mono/cil/cil-opcodes.xml)
> -
> - # looks like we have to install this, otherwhise not even helloworld.cs does work
> - @$(call install_copy, mono, 0, 0, 0755, \
> - $(MONO_DIR)/mcs/class/lib/monolite/mscorlib.dll, \
> - /usr/lib/mono/1.0/mscorlib.dll)
> -
> - @$(call install_finish, mono)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] udisks: remove after one year in staging
2020-06-21 22:29 ` [ptxdist] [PATCH 5/5] udisks: " Roland Hieber
@ 2020-06-26 11:00 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2020-06-26 11:00 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as f56712604dde77922b90c9ae3b2a8bbd5192778c.
Michael
[sent from post-receive hook]
On Fri, 26 Jun 2020 13:00:52 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200621222953.12596-5-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/udisks-1.0.0/autogen.sh b/patches/udisks-1.0.0/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7ddcb..000000000000
> --- a/patches/udisks-1.0.0/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/udisks-1.0.0/devmapper-optional.diff b/patches/udisks-1.0.0/devmapper-optional.diff
> deleted file mode 100644
> index 3a7a3368b820..000000000000
> --- a/patches/udisks-1.0.0/devmapper-optional.diff
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Subject: make devmapper dependency optional
> -
> -This patch adds a configure option for devmapper.
> -When disabled, the helper program using it will not be built.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> -
> ----
> - configure.ac | 11 ++++++++---
> - src/probers/Makefile.am | 5 ++++-
> - 2 files changed, 12 insertions(+), 4 deletions(-)
> -
> -Index: b/configure.ac
> -===================================================================
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -173,9 +173,14 @@ if test "x$enable_libparted" = xyes; the
> - fi
> - AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
> -
> --PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
> --AC_SUBST(DEVMAPPER_CFLAGS)
> --AC_SUBST(DEVMAPPER_LIBS)
> -+AC_ARG_ENABLE(devmapper,[ --disable-devmapper],enable_devmapper=$enableval,enable_devmapper=yes)
> -+
> -+if test "x$enable_devmapper" = xyes; then
> -+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
> -+ AC_SUBST(DEVMAPPER_CFLAGS)
> -+ AC_SUBST(DEVMAPPER_LIBS)
> -+fi
> -+AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes)
> -
> - have_lvm2=no
> - AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support]))
> -Index: b/src/probers/Makefile.am
> -===================================================================
> ---- a/src/probers/Makefile.am
> -+++ b/src/probers/Makefile.am
> -@@ -22,7 +22,6 @@ INCLUDES = \
> -
> - udevhelperdir = $(slashlibdir)/udev
> - udevhelper_PROGRAMS = \
> -- udisks-dm-export \
> - udisks-probe-ata-smart \
> - udisks-probe-sas-expander \
> - $(NULL)
> -@@ -31,6 +30,10 @@ if LIBPARTED_ENABLED
> - udevhelper_PROGRAMS += udisks-part-id
> - endif
> -
> -+if DEVMAPPER_ENABLED
> -+udevhelper_PROGRAMS += udisks-dm-export
> -+endif
> -+
> - if HAVE_LVM2
> - udevhelper_PROGRAMS += udisks-lvm-pv-export
> - endif
> diff --git a/patches/udisks-1.0.0/libparted-optional.diff b/patches/udisks-1.0.0/libparted-optional.diff
> deleted file mode 100644
> index e5027ccf17d3..000000000000
> --- a/patches/udisks-1.0.0/libparted-optional.diff
> +++ /dev/null
> @@ -1,90 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Subject: make libparted dependency optional
> -
> -This patch adds a configure option for libparted.
> -When disabled, the helper programs using it will not be built.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> -
> ----
> - configure.ac | 11 ++++++++---
> - src/helpers/Makefile.am | 13 +++++++++----
> - src/probers/Makefile.am | 6 +++++-
> - 3 files changed, 22 insertions(+), 8 deletions(-)
> -
> -Index: b/configure.ac
> -===================================================================
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -164,9 +164,14 @@ PKG_CHECK_MODULES(POLKIT_BACKEND_1, [pol
> - AC_SUBST(POLKIT_BACKEND_1_CFLAGS)
> - AC_SUBST(POLKIT_BACKEND_1_LIBS)
> -
> --PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
> --AC_SUBST(LIBPARTED_CFLAGS)
> --AC_SUBST(LIBPARTED_LIBS)
> -+AC_ARG_ENABLE(libparted,[ --disable-libparted],enable_libparted=$enableval,enable_libparted=yes)
> -+
> -+if test "x$enable_libparted" = xyes; then
> -+ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
> -+ AC_SUBST(LIBPARTED_CFLAGS)
> -+ AC_SUBST(LIBPARTED_LIBS)
> -+fi
> -+AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
> -
> - PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
> - AC_SUBST(DEVMAPPER_CFLAGS)
> -Index: b/src/helpers/Makefile.am
> -===================================================================
> ---- a/src/helpers/Makefile.am
> -+++ b/src/helpers/Makefile.am
> -@@ -19,10 +19,6 @@ INCLUDES = \
> -
> - libexec_PROGRAMS = \
> - udisks-helper-mkfs \
> -- udisks-helper-delete-partition \
> -- udisks-helper-create-partition \
> -- udisks-helper-modify-partition \
> -- udisks-helper-create-partition-table \
> - udisks-helper-change-filesystem-label \
> - udisks-helper-linux-md-remove-component \
> - udisks-helper-fstab-mounter \
> -@@ -37,7 +33,16 @@ if SGUTILS2_ENABLED
> - libexec_PROGRAMS += udisks-helper-drive-detach
> - endif
> -
> -+if LIBPARTED_ENABLED
> -+libexec_PROGRAMS += \
> -+ udisks-helper-delete-partition \
> -+ udisks-helper-create-partition \
> -+ udisks-helper-modify-partition \
> -+ udisks-helper-create-partition-table \
> -+ $(NULL)
> -+
> - noinst_LTLIBRARIES = libpartutil.la
> -+endif
> - libpartutil_la_SOURCES = partutil.h partutil.c
> - libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
> - libpartutil_la_LIBADD = $(LIBPARTED_LIBS)
> -Index: b/src/probers/Makefile.am
> -===================================================================
> ---- a/src/probers/Makefile.am
> -+++ b/src/probers/Makefile.am
> -@@ -21,12 +21,16 @@ INCLUDES = \
> - #
> -
> - udevhelperdir = $(slashlibdir)/udev
> --udevhelper_PROGRAMS = udisks-part-id \
> -+udevhelper_PROGRAMS = \
> - udisks-dm-export \
> - udisks-probe-ata-smart \
> - udisks-probe-sas-expander \
> - $(NULL)
> -
> -+if LIBPARTED_ENABLED
> -+udevhelper_PROGRAMS += udisks-part-id
> -+endif
> -+
> - if HAVE_LVM2
> - udevhelper_PROGRAMS += udisks-lvm-pv-export
> - endif
> diff --git a/patches/udisks-1.0.0/libsgutils-optional.diff b/patches/udisks-1.0.0/libsgutils-optional.diff
> deleted file mode 100644
> index 75ee410806a5..000000000000
> --- a/patches/udisks-1.0.0/libsgutils-optional.diff
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Subject: make sgutils2 dependency optional
> -
> -This patch adds a configure option for sgutils2.
> -When disabled, the helper program using it will not be built.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> -
> ----
> - configure.ac | 23 ++++++++++++++---------
> - src/helpers/Makefile.am | 5 ++++-
> - 2 files changed, 18 insertions(+), 10 deletions(-)
> -
> -Index: b/configure.ac
> -===================================================================
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -120,15 +120,20 @@ if test "x$GCC" = "xyes"; then
> - changequote([,])dnl
> - fi
> -
> --have_sgutils="false"
> --AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
> --if test x$have_sgutils != "xtrue"; then
> -- AC_MSG_ERROR([libsgutils2 is needed])
> --fi
> --SGUTILS_CFLAGS=""
> --SGUTILS_LIBS="-lsgutils2"
> --AC_SUBST(SGUTILS_CFLAGS)
> --AC_SUBST(SGUTILS_LIBS)
> -+AC_ARG_ENABLE(sgutils2, [ --disable-sgutils2],enable_sgutils2=$enableval,enable_sgutils2=yes)
> -+
> -+if test "x$enable_sgutils2" = xyes; then
> -+ have_sgutils="false"
> -+ AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
> -+ if test x$have_sgutils != "xtrue"; then
> -+ AC_MSG_ERROR([libsgutils2 is needed])
> -+ fi
> -+ SGUTILS_CFLAGS=""
> -+ SGUTILS_LIBS="-lsgutils2"
> -+ AC_SUBST(SGUTILS_CFLAGS)
> -+ AC_SUBST(SGUTILS_LIBS)
> -+fi
> -+AM_CONDITIONAL(SGUTILS2_ENABLED, test "x$enable_sgutils2" = xyes)
> -
> -
> - PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 147])
> -Index: b/src/helpers/Makefile.am
> -===================================================================
> ---- a/src/helpers/Makefile.am
> -+++ b/src/helpers/Makefile.am
> -@@ -28,12 +28,15 @@ libexec_PROGRAMS = \
> - udisks-helper-fstab-mounter \
> - udisks-helper-ata-smart-collect \
> - udisks-helper-ata-smart-selftest \
> -- udisks-helper-drive-detach \
> - udisks-helper-drive-poll \
> - udisks-helper-linux-md-check \
> - udisks-helper-drive-benchmark \
> - $(NULL)
> -
> -+if SGUTILS2_ENABLED
> -+libexec_PROGRAMS += udisks-helper-drive-detach
> -+endif
> -+
> - noinst_LTLIBRARIES = libpartutil.la
> - libpartutil_la_SOURCES = partutil.h partutil.c
> - libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
> diff --git a/patches/udisks-1.0.0/series b/patches/udisks-1.0.0/series
> deleted file mode 100644
> index e490966aa3a3..000000000000
> --- a/patches/udisks-1.0.0/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -libsgutils-optional.diff
> -libparted-optional.diff
> -devmapper-optional.diff
> -smart-optional.diff
> diff --git a/patches/udisks-1.0.0/smart-optional.diff b/patches/udisks-1.0.0/smart-optional.diff
> deleted file mode 100644
> index a5e405cd21df..000000000000
> --- a/patches/udisks-1.0.0/smart-optional.diff
> +++ /dev/null
> @@ -1,415 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Subject: make libatasmart dependency optional
> -
> -This patch adds a configure option for libatasmart.
> -When disabled, the helper programs using it will not be built.
> -Any other code using libatasmart is guarded with appropriate ifdefs.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> -
> ----
> - configure.ac | 12 +++++++++---
> - src/adapter-private.h | 1 -
> - src/adapter.c | 1 -
> - src/daemon.c | 4 ++++
> - src/device-private.c | 2 ++
> - src/device-private.h | 6 ++++++
> - src/device.c | 20 ++++++++++++++++++++
> - src/expander-private.h | 1 -
> - src/expander.c | 1 -
> - src/helpers/Makefile.am | 9 +++++++--
> - src/port-private.h | 1 -
> - src/probers/Makefile.am | 5 ++++-
> - tools/udisks.c | 6 ++++++
> - 13 files changed, 58 insertions(+), 11 deletions(-)
> -
> -Index: b/configure.ac
> -===================================================================
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -204,9 +204,15 @@ if test "x$enable_dmmp" != "xno"; then
> - fi
> - AM_CONDITIONAL(HAVE_DMMP, [test "$have_dmmp" = "yes"])
> -
> --PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
> --AC_SUBST(LIBATASMART_CFLAGS)
> --AC_SUBST(LIBATASMART_LIBS)
> -+AC_ARG_ENABLE(libatasmart,[ --disable-libatasmart],enable_libatasmart=$enableval,enable_libatasmart=yes)
> -+
> -+if test "x$enable_libatasmart" = xyes; then
> -+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
> -+ AC_SUBST(LIBATASMART_CFLAGS)
> -+ AC_SUBST(LIBATASMART_LIBS)
> -+ AC_DEFINE(LIBATASMART_ENABLED,[1],[libatasmart enabled])
> -+fi
> -+AM_CONDITIONAL(LIBATASMART_ENABLED, test "x$enable_libatasmart" = xyes)
> -
> - PKG_CHECK_MODULES(LIBUDEV, [libudev >= 143])
> - AC_SUBST(LIBUDEV_CFLAGS)
> -Index: b/src/device-private.h
> -===================================================================
> ---- a/src/device-private.h
> -+++ b/src/device-private.h
> -@@ -23,7 +23,9 @@
> -
> - #include <dbus/dbus-glib.h>
> - #include <gudev/gudev.h>
> -+#ifdef LIBATASMART_ENABLED
> - #include <atasmart.h>
> -+#endif
> -
> - #include "types.h"
> -
> -@@ -224,7 +226,9 @@ struct DevicePrivate
> -
> - gboolean drive_ata_smart_is_available;
> - guint64 drive_ata_smart_time_collected;
> -+#ifdef LIBATASMART_ENABLED
> - SkSmartOverall drive_ata_smart_status;
> -+#endif
> - void *drive_ata_smart_blob;
> - gsize drive_ata_smart_blob_size;
> -
> -@@ -389,10 +393,12 @@ void device_set_dm_name (Device *device,
> - void device_set_slaves_objpath (Device *device, GStrv value);
> - void device_set_holders_objpath (Device *device, GStrv value);
> -
> -+#ifdef LIBATASMART_ENABLED
> - void device_set_drive_ata_smart_is_available (Device *device, gboolean value);
> - void device_set_drive_ata_smart_time_collected (Device *device, guint64 value);
> - void device_set_drive_ata_smart_status (Device *device, SkSmartOverall value);
> - void device_set_drive_ata_smart_blob_steal (Device *device, gchar *blob, gsize blob_size);
> -+#endif
> -
> - G_END_DECLS
> -
> -Index: b/src/device.c
> -===================================================================
> ---- a/src/device.c
> -+++ b/src/device.c
> -@@ -49,7 +49,9 @@
> - #include <dbus/dbus-glib.h>
> - #include <dbus/dbus-glib-lowlevel.h>
> - #include <gudev/gudev.h>
> -+#ifdef LIBATASMART_ENABLED
> - #include <atasmart.h>
> -+#endif
> -
> - #include "daemon.h"
> - #include "device.h"
> -@@ -658,6 +660,7 @@ get_property (GObject *object,
> - case PROP_DRIVE_ATA_SMART_TIME_COLLECTED:
> - g_value_set_uint64 (value, device->priv->drive_ata_smart_time_collected);
> - break;
> -+#ifdef LIBATASMART_ENABLED
> - case PROP_DRIVE_ATA_SMART_STATUS:
> - {
> - const gchar *status;
> -@@ -668,6 +671,7 @@ get_property (GObject *object,
> - g_value_set_string (value, status);
> - }
> - break;
> -+#endif
> - case PROP_DRIVE_ATA_SMART_BLOB:
> - {
> - GArray *a;
> -@@ -1740,7 +1744,9 @@ device_init (Device *device)
> - device->priv->slaves_objpath = g_ptr_array_new ();
> - device->priv->holders_objpath = g_ptr_array_new ();
> -
> -+#ifdef LIBATASMART_ENABLED
> - device->priv->drive_ata_smart_status = -1;
> -+#endif
> - }
> -
> - static void
> -@@ -3830,6 +3836,7 @@ update_info_linux_md (Device *device)
> - static gboolean
> - update_info_drive_ata_smart (Device *device)
> - {
> -+#ifdef LIBATASMART_ENABLED
> - gboolean ata_smart_is_available;
> -
> - ata_smart_is_available = FALSE;
> -@@ -3842,6 +3849,7 @@ update_info_drive_ata_smart (Device *dev
> - * collecting data is done in separate routines, see the
> - * device_drive_ata_smart_refresh_data() function for details.
> - */
> -+#endif
> -
> - return TRUE;
> - }
> -@@ -9646,6 +9654,7 @@ device_filesystem_set_label (Device *dev
> -
> - /*--------------------------------------------------------------------------------------------------------------*/
> -
> -+#ifdef LIBATASMART_ENABLED
> - /* may be called with context==NULL */
> - static void
> - drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context,
> -@@ -9848,6 +9857,7 @@ device_drive_ata_smart_refresh_data_auth
> - ;
> - PROFILE ("device_drive_ata_smart_refresh_data_authorized_cb(device=%s) end", device->priv->native_path);
> - }
> -+#endif /* LIBATASMART_ENABLED */
> -
> - /* may be called with context==NULL */
> - gboolean
> -@@ -9855,6 +9865,7 @@ device_drive_ata_smart_refresh_data (Dev
> - char **options,
> - DBusGMethodInvocation *context)
> - {
> -+#ifdef LIBATASMART_ENABLED
> - const gchar *action_id;
> -
> - action_id = NULL;
> -@@ -9875,10 +9886,14 @@ device_drive_ata_smart_refresh_data (Dev
> - g_strfreev);
> -
> - return TRUE;
> -+#else
> -+ return FALSE;
> -+#endif
> - }
> -
> - /*--------------------------------------------------------------------------------------------------------------*/
> -
> -+#ifdef LIBATASMART_ENABLED
> - static void
> - drive_ata_smart_initiate_selftest_completed_cb (DBusGMethodInvocation *context,
> - Device *device,
> -@@ -9975,6 +9990,7 @@ device_drive_ata_smart_initiate_selftest
> - out:
> - ;
> - }
> -+#endif /* LIBATASMART_ENABLED */
> -
> - gboolean
> - device_drive_ata_smart_initiate_selftest (Device *device,
> -@@ -9982,6 +9998,7 @@ device_drive_ata_smart_initiate_selftest
> - gchar **options,
> - DBusGMethodInvocation *context)
> - {
> -+#ifdef LIBATASMART_ENABLED
> - if (!device->priv->drive_ata_smart_is_available)
> - {
> - throw_error (context, ERROR_FAILED, "Device does not support ATA SMART");
> -@@ -10003,6 +10020,9 @@ device_drive_ata_smart_initiate_selftest
> -
> - out:
> - return TRUE;
> -+#else
> -+ return FALSE;
> -+#endif
> - }
> -
> - /*--------------------------------------------------------------------------------------------------------------*/
> -Index: b/src/device-private.c
> -===================================================================
> ---- a/src/device-private.c
> -+++ b/src/device-private.c
> -@@ -1354,6 +1354,7 @@ device_set_holders_objpath (Device *devi
> - }
> - }
> -
> -+#ifdef LIBATASMART_ENABLED
> - void
> - device_set_drive_ata_smart_is_available (Device *device,
> - gboolean value)
> -@@ -1400,6 +1401,7 @@ device_set_drive_ata_smart_blob_steal (D
> -
> - emit_changed (device, "drive_ata_smart_blob");
> - }
> -+#endif /* LIBATASMART_ENABLED */
> -
> -
> - void
> -Index: b/tools/udisks.c
> -===================================================================
> ---- a/tools/udisks.c
> -+++ b/tools/udisks.c
> -@@ -43,7 +43,9 @@
> - #include <dbus/dbus-glib.h>
> - #include <dbus/dbus-glib-lowlevel.h>
> -
> -+#ifdef LIBATASMART_ENABLED
> - #include <atasmart.h>
> -+#endif
> -
> - #include "udisks-daemon-glue.h"
> - #include "udisks-device-glue.h"
> -@@ -1003,6 +1005,7 @@ ata_smart_status_to_desc (const gchar *s
> - return desc;
> - }
> -
> -+#ifdef LIBATASMART_ENABLED
> - static gchar *
> - get_ata_smart_unit (guint unit,
> - guint64 pretty_value)
> -@@ -1137,6 +1140,7 @@ print_ata_smart_attr (SkDisk *d,
> - g_free (threshold_str);
> - g_free (pretty);
> - }
> -+#endif
> -
> - static void
> - do_show_info (const char *object_path)
> -@@ -1419,6 +1423,7 @@ do_show_info (const char *object_path)
> -
> - /* ------------------------------------------------------------------------------------------------- */
> -
> -+#ifdef LIBATASMART_ENABLED
> - if (!props->drive_ata_smart_is_available)
> - {
> - g_print (" ATA SMART: not available\n");
> -@@ -1471,6 +1476,7 @@ do_show_info (const char *object_path)
> - }
> -
> - }
> -+#endif
> -
> - /* ------------------------------------------------------------------------------------------------- */
> -
> -Index: b/src/helpers/Makefile.am
> -===================================================================
> ---- a/src/helpers/Makefile.am
> -+++ b/src/helpers/Makefile.am
> -@@ -22,13 +22,18 @@ libexec_PROGRAMS = \
> - udisks-helper-change-filesystem-label \
> - udisks-helper-linux-md-remove-component \
> - udisks-helper-fstab-mounter \
> -- udisks-helper-ata-smart-collect \
> -- udisks-helper-ata-smart-selftest \
> - udisks-helper-drive-poll \
> - udisks-helper-linux-md-check \
> - udisks-helper-drive-benchmark \
> - $(NULL)
> -
> -+if LIBATASMART_ENABLED
> -+libexec_PROGRAMS += \
> -+ udisks-helper-ata-smart-collect \
> -+ udisks-helper-ata-smart-selftest \
> -+ $(NULL)
> -+endif
> -+
> - if SGUTILS2_ENABLED
> - libexec_PROGRAMS += udisks-helper-drive-detach
> - endif
> -Index: b/src/probers/Makefile.am
> -===================================================================
> ---- a/src/probers/Makefile.am
> -+++ b/src/probers/Makefile.am
> -@@ -22,7 +22,6 @@ INCLUDES = \
> -
> - udevhelperdir = $(slashlibdir)/udev
> - udevhelper_PROGRAMS = \
> -- udisks-probe-ata-smart \
> - udisks-probe-sas-expander \
> - $(NULL)
> -
> -@@ -38,6 +37,10 @@ if HAVE_LVM2
> - udevhelper_PROGRAMS += udisks-lvm-pv-export
> - endif
> -
> -+if LIBATASMART_ENABLED
> -+udevhelper_PROGRAMS += udisks-probe-ata-smart
> -+endif
> -+
> - udisks_part_id_SOURCES = part-id.c
> - udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
> - udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) $(top_builddir)/src/helpers/libpartutil.la
> -Index: b/src/adapter-private.h
> -===================================================================
> ---- a/src/adapter-private.h
> -+++ b/src/adapter-private.h
> -@@ -23,7 +23,6 @@
> -
> - #include <dbus/dbus-glib.h>
> - #include <gudev/gudev.h>
> --#include <atasmart.h>
> -
> - #include "types.h"
> -
> -Index: b/src/expander-private.h
> -===================================================================
> ---- a/src/expander-private.h
> -+++ b/src/expander-private.h
> -@@ -23,7 +23,6 @@
> -
> - #include <dbus/dbus-glib.h>
> - #include <gudev/gudev.h>
> --#include <atasmart.h>
> -
> - #include "types.h"
> -
> -Index: b/src/port-private.h
> -===================================================================
> ---- a/src/port-private.h
> -+++ b/src/port-private.h
> -@@ -23,7 +23,6 @@
> -
> - #include <dbus/dbus-glib.h>
> - #include <gudev/gudev.h>
> --#include <atasmart.h>
> -
> - #include "types.h"
> -
> -Index: b/src/adapter.c
> -===================================================================
> ---- a/src/adapter.c
> -+++ b/src/adapter.c
> -@@ -30,7 +30,6 @@
> - #include <dbus/dbus-glib.h>
> - #include <dbus/dbus-glib-lowlevel.h>
> - #include <gudev/gudev.h>
> --#include <atasmart.h>
> -
> - #include "daemon.h"
> - #include "adapter.h"
> -Index: b/src/daemon.c
> -===================================================================
> ---- a/src/daemon.c
> -+++ b/src/daemon.c
> -@@ -1719,6 +1719,7 @@ mdstat_changed_event (GIOChannel *channe
> - return TRUE;
> - }
> -
> -+#ifdef LIBATASMART_ENABLED
> - static gboolean
> - refresh_ata_smart_data (Daemon *daemon)
> - {
> -@@ -1747,6 +1748,7 @@ refresh_ata_smart_data (Daemon *daemon)
> -
> - return FALSE;
> - }
> -+#endif /* LIBATASMART_ENABLED */
> -
> - static gboolean
> - register_disks_daemon (Daemon *daemon)
> -@@ -1949,12 +1951,14 @@ daemon_new (void)
> - mount_file_clean_stale (l);
> - g_list_free (l);
> -
> -+#ifdef LIBATASMART_ENABLED
> - /* set up timer for refreshing ATA SMART data - we don't want to refresh immediately because
> - * when adding a device we also do this...
> - */
> - daemon->priv->ata_smart_refresh_timer_id = g_timeout_add_seconds (ATA_SMART_REFRESH_INTERVAL_SECONDS,
> - (GSourceFunc) refresh_ata_smart_data,
> - daemon);
> -+#endif /* LIBATASMART_ENABLED */
> -
> - PROFILE ("daemon_new(): end");
> - return daemon;
> -Index: b/src/expander.c
> -===================================================================
> ---- a/src/expander.c
> -+++ b/src/expander.c
> -@@ -34,7 +34,6 @@
> - #include <dbus/dbus-glib.h>
> - #include <dbus/dbus-glib-lowlevel.h>
> - #include <gudev/gudev.h>
> --#include <atasmart.h>
> - #include <stdlib.h>
> -
> - #include "daemon.h"
> diff --git a/rules/udisks.in b/rules/udisks.in
> deleted file mode 100644
> index e855c1c66179..000000000000
> --- a/rules/udisks.in
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=shell_and_console
> -
> -comment "udisks conflicts with BusyBox' mount!"
> - depends on BUSYBOX_MOUNT
> -
> -comment "udisks conflicts with BusyBox' umount!"
> - depends on BUSYBOX_MOUNT
> -
> -menuconfig UDISKS
> - tristate
> - select HOST_GTK_DOC
> - select HOST_LIBXSLT
> - select GLIB
> - select DBUS
> - select DBUS_GLIB
> - select POLKIT
> - select UDEV
> - select UDEV_LIBUDEV
> - select LIBGUDEV
> - # busybox mount can't handle all the options
> - depends on !BUSYBOX_MOUNT || ALLYES
> - depends on !BUSYBOX_UMOUNT || ALLYES
> - select UTIL_LINUX_NG
> - select UTIL_LINUX_NG_MOUNT
> - select UTIL_LINUX_NG_UMOUNT
> - select FAKE_OVERLAYFS if UDISKS_FAKE_OVERLAYFS
> - select FAKE_OVERLAYFS_VAR_TMP if UDISKS_FAKE_OVERLAYFS && !FAKE_OVERLAYFS_VAR
> - prompt "udisks "
> - help
> - abstraction for enumerating block devices
> -
> - Udisks is an abstraction for enumerating block
> - devices and performing operations on them. Any application
> - can access the org.freedesktop.UDisks. Disks service on
> - the system message bus. Some operations (such as formatting
> - disks etc.) are restricted using PolicyKit.
> -
> - STAGING: remove in ptxdist-2020.06.0
> - Old version that need to be updated. Fails to build with glibc-2.28.
> -
> -if UDISKS
> -
> -config UDISKS_FAKE_OVERLAYFS
> - bool
> - prompt "use fake overlayfs"
> - help
> - This makes sure that all necessary directories and files
> - are available and writeable on a readonly rootfs + tmpfs for
> - writable directories.
> -
> -endif
> -
> diff --git a/rules/udisks.make b/rules/udisks.make
> deleted file mode 100644
> index 93bde262cbbb..000000000000
> --- a/rules/udisks.make
> +++ /dev/null
> @@ -1,117 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_UDISKS) += udisks
> -
> -#
> -# Paths and names
> -#
> -UDISKS_VERSION := 1.0.0
> -UDISKS_MD5 := a33fac347956e015f40e56a86d63f8ff
> -UDISKS := udisks-$(UDISKS_VERSION)
> -UDISKS_SUFFIX := tar.gz
> -UDISKS_URL := http://hal.freedesktop.org/releases/$(UDISKS).$(UDISKS_SUFFIX)
> -UDISKS_SOURCE := $(SRCDIR)/$(UDISKS).$(UDISKS_SUFFIX)
> -UDISKS_DIR := $(BUILDDIR)/$(UDISKS)
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -#
> -# autoconf
> -#
> -UDISKS_AUTOCONF := \
> - $(CROSS_AUTOCONF_USR) \
> - $(GLOBAL_LARGE_FILE_OPTION) \
> - --enable-shared \
> - --enable-static \
> - --disable-ansi \
> - --disable-man-pages \
> - --disable-gtk-doc \
> - --enable-gtk-doc-html \
> - --enable-gtk-doc-pdf \
> - --with-gnu-ld \
> - --disable-sgutils2 \
> - --disable-libparted \
> - --disable-devmapper \
> - --disable-libatasmart
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/udisks.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, udisks)
> - @$(call install_fixup, udisks,PRIORITY,optional)
> - @$(call install_fixup, udisks,SECTION,base)
> - @$(call install_fixup, udisks,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
> - @$(call install_fixup, udisks,DESCRIPTION,missing)
> -
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/bin/udisks)
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /sbin/umount.udisks)
> -
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/libexec/udisks-daemon)
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/libexec/udisks-helper-change-filesystem-label)
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/libexec/udisks-helper-change-luks-password)
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/libexec/udisks-helper-drive-poll)
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/libexec/udisks-helper-fstab-mounter)
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/libexec/udisks-helper-linux-md-check)
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/libexec/udisks-helper-linux-md-remove-component)
> - @$(call install_copy, udisks, 0, 0, 0755, -, \
> - /usr/libexec/udisks-helper-mkfs)
> -
> - @$(call install_copy, udisks, 0, 0, 0644, -, \
> - /lib/udev/rules.d/80-udisks.rules)
> -
> - @$(call install_copy, udisks, 0, 0, 0644, -, \
> - /etc/dbus-1/system.d/org.freedesktop.UDisks.conf)
> - @$(call install_copy, udisks, 0, 0, 0644, -, \
> - /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml)
> - @$(call install_copy, udisks, 0, 0, 0644, -, \
> - /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml)
> - @$(call install_copy, udisks, 0, 0, 0644, -, \
> - /usr/share/dbus-1/system-services/org.freedesktop.UDisks.service)
> -
> - @$(call install_copy, udisks, 0, 0, 0644, -, \
> - /usr/share/polkit-1/actions/org.freedesktop.udisks.policy)
> - @$(call install_copy, udisks, 0, 0, 0644, -, \
> - /usr/lib/polkit-1/extensions/libudisks-action-lookup.so)
> -
> -ifdef PTXCONF_UDISKS_FAKE_OVERLAYFS
> - @$(call install_copy, udisks, 0, 0, 0755, /var/tmp/media)
> - @$(call install_link, udisks, var/tmp/media, /media)
> - @$(call install_link, udisks, ../tmp/udisks, \
> - /var/lib/udisks)
> - @$(call install_copy, udisks, 0, 0, 0755, \
> - /var/tmp/udisks)
> -else
> - @$(call install_copy, udisks, 0, 0, 0755, /media)
> - @$(call install_copy, udisks, 0, 0, 0755, \
> - /var/lib/udisks)
> -endif
> -
> - @$(call install_finish, udisks)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH v2] sepolgen: remove after one year in staging
2020-06-22 12:26 ` Michael Olbrich
2020-06-22 12:56 ` Ladislav Michl
@ 2020-06-28 21:20 ` Roland Hieber
2020-06-28 21:24 ` [ptxdist] [PATCH v3] " Roland Hieber
2 siblings, 0 replies; 16+ messages in thread
From: Roland Hieber @ 2020-06-28 21:20 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2:
- policycoreutils.in: replace STAGING with BROKEN for
POLICYCOREUTILS_PYTHON (Feedback from Michael Olbrich)
rules/policycoreutils.in | 2 +-
rules/sepolgen.in | 29 ---------------------
rules/sepolgen.make | 54 ----------------------------------------
3 files changed, 1 insertion(+), 84 deletions(-)
delete mode 100644 rules/sepolgen.in
delete mode 100644 rules/sepolgen.make
diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
index 856b50046d5b..2c02affdbd4f 100644
--- a/rules/policycoreutils.in
+++ b/rules/policycoreutils.in
@@ -29,7 +29,7 @@ menuconfig POLICYCOREUTILS
if POLICYCOREUTILS
menuconfig POLICYCOREUTILS_PYTHON
- depends on STAGING
+ depends on BROKEN
bool "python based tools"
if POLICYCOREUTILS_PYTHON
diff --git a/rules/sepolgen.in b/rules/sepolgen.in
deleted file mode 100644
index 94f2ce071ab8..000000000000
--- a/rules/sepolgen.in
+++ /dev/null
@@ -1,29 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=selinux
-
-config SEPOLGEN
- tristate
- prompt "sepolgen"
- select PYTHON
- select LIBSELINUX
- select LIBSELINUX_PYTHON
- help
- A Python module used in SELinux policy generation
-
- This package contains a Python module that forms the core of
- the modern audit2allow (which is a part of the package
- policycoreutils). The sepolgen library is structured to give
- flexibility to the application using it. The library
- contains: Reference Policy Representation, which are Objects
- for representing policies and the reference policy
- interfaces. Secondly, it has objects and algorithms for
- representing access and sets of access in an abstract way
- and searching that access. It also has a parser for
- reference policy "headers". It contains infrastructure for
- parsing SELinux related messages as produced by the audit
- system. It has facilities for generating policy based on
- required access.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that needs to be updated.
diff --git a/rules/sepolgen.make b/rules/sepolgen.make
deleted file mode 100644
index 7084e1d1d348..000000000000
--- a/rules/sepolgen.make
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen
-
-#
-# Paths and names
-#
-SEPOLGEN_VERSION := 1.1.8
-SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d
-SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION)
-SEPOLGEN_SUFFIX := tar.gz
-SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
-SEPOLGEN_SOURCE := $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
-SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN)
-SEPOLGEN_LICENSE := GPL-2.0-only
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-SEPOLGEN_CONF_TOOL := NO
-# no ':=' because of $(PYTHON_SITEPACKAGES)
-SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/sepolgen.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, sepolgen)
- @$(call install_fixup, sepolgen,PRIORITY,optional)
- @$(call install_fixup, sepolgen,SECTION,base)
- @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
- @$(call install_fixup, sepolgen,DESCRIPTION,missing)
-
- @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES))
- @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map)
-
- @$(call install_finish, sepolgen)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH v3] sepolgen: remove after one year in staging
2020-06-22 12:26 ` Michael Olbrich
2020-06-22 12:56 ` Ladislav Michl
2020-06-28 21:20 ` [ptxdist] [PATCH v2] " Roland Hieber
@ 2020-06-28 21:24 ` Roland Hieber
2020-07-06 6:38 ` Michael Olbrich
2 siblings, 1 reply; 16+ messages in thread
From: Roland Hieber @ 2020-06-28 21:24 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v3:
- also add an explaining comment why POLICYCOREUTILS_PYTHON is broken
(Feedback from Michael Olbrich)
v2:
- policycoreutils.in: replace STAGING with BROKEN for
POLICYCOREUTILS_PYTHON (Feedback from Michael Olbrich)
# needs sepolgen
rules/policycoreutils.in | 3 ++-
rules/sepolgen.in | 29 ---------------------
rules/sepolgen.make | 54 ----------------------------------------
3 files changed, 2 insertions(+), 84 deletions(-)
delete mode 100644 rules/sepolgen.in
delete mode 100644 rules/sepolgen.make
diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
index 856b50046d5b..e5f0f5778556 100644
--- a/rules/policycoreutils.in
+++ b/rules/policycoreutils.in
@@ -29,7 +29,8 @@ menuconfig POLICYCOREUTILS
if POLICYCOREUTILS
menuconfig POLICYCOREUTILS_PYTHON
- depends on STAGING
+ # needs sepolgen
+ depends on BROKEN
bool "python based tools"
if POLICYCOREUTILS_PYTHON
diff --git a/rules/sepolgen.in b/rules/sepolgen.in
deleted file mode 100644
index 94f2ce071ab8..000000000000
--- a/rules/sepolgen.in
+++ /dev/null
@@ -1,29 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=selinux
-
-config SEPOLGEN
- tristate
- prompt "sepolgen"
- select PYTHON
- select LIBSELINUX
- select LIBSELINUX_PYTHON
- help
- A Python module used in SELinux policy generation
-
- This package contains a Python module that forms the core of
- the modern audit2allow (which is a part of the package
- policycoreutils). The sepolgen library is structured to give
- flexibility to the application using it. The library
- contains: Reference Policy Representation, which are Objects
- for representing policies and the reference policy
- interfaces. Secondly, it has objects and algorithms for
- representing access and sets of access in an abstract way
- and searching that access. It also has a parser for
- reference policy "headers". It contains infrastructure for
- parsing SELinux related messages as produced by the audit
- system. It has facilities for generating policy based on
- required access.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that needs to be updated.
diff --git a/rules/sepolgen.make b/rules/sepolgen.make
deleted file mode 100644
index 7084e1d1d348..000000000000
--- a/rules/sepolgen.make
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen
-
-#
-# Paths and names
-#
-SEPOLGEN_VERSION := 1.1.8
-SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d
-SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION)
-SEPOLGEN_SUFFIX := tar.gz
-SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
-SEPOLGEN_SOURCE := $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
-SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN)
-SEPOLGEN_LICENSE := GPL-2.0-only
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-SEPOLGEN_CONF_TOOL := NO
-# no ':=' because of $(PYTHON_SITEPACKAGES)
-SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/sepolgen.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, sepolgen)
- @$(call install_fixup, sepolgen,PRIORITY,optional)
- @$(call install_fixup, sepolgen,SECTION,base)
- @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
- @$(call install_fixup, sepolgen,DESCRIPTION,missing)
-
- @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES))
- @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map)
-
- @$(call install_finish, sepolgen)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [PATCH v3] sepolgen: remove after one year in staging
2020-06-28 21:24 ` [ptxdist] [PATCH v3] " Roland Hieber
@ 2020-07-06 6:38 ` Michael Olbrich
2020-07-06 12:49 ` [ptxdist] [PATCH v2] " Roland Hieber
0 siblings, 1 reply; 16+ messages in thread
From: Michael Olbrich @ 2020-07-06 6:38 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
On Sun, Jun 28, 2020 at 11:24:24PM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
.../ptxdist/rules/policycoreutils.in:14:warning: 'select' used by config symbol 'POLICYCOREUTILS' refers to undefined symbol 'SEPOLGEN'
Michael
> ---
> v3:
> - also add an explaining comment why POLICYCOREUTILS_PYTHON is broken
> (Feedback from Michael Olbrich)
> v2:
> - policycoreutils.in: replace STAGING with BROKEN for
> POLICYCOREUTILS_PYTHON (Feedback from Michael Olbrich)
>
> # needs sepolgen
>
> rules/policycoreutils.in | 3 ++-
> rules/sepolgen.in | 29 ---------------------
> rules/sepolgen.make | 54 ----------------------------------------
> 3 files changed, 2 insertions(+), 84 deletions(-)
> delete mode 100644 rules/sepolgen.in
> delete mode 100644 rules/sepolgen.make
>
> diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
> index 856b50046d5b..e5f0f5778556 100644
> --- a/rules/policycoreutils.in
> +++ b/rules/policycoreutils.in
> @@ -29,7 +29,8 @@ menuconfig POLICYCOREUTILS
> if POLICYCOREUTILS
>
> menuconfig POLICYCOREUTILS_PYTHON
> - depends on STAGING
> + # needs sepolgen
> + depends on BROKEN
> bool "python based tools"
>
> if POLICYCOREUTILS_PYTHON
> diff --git a/rules/sepolgen.in b/rules/sepolgen.in
> deleted file mode 100644
> index 94f2ce071ab8..000000000000
> --- a/rules/sepolgen.in
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=selinux
> -
> -config SEPOLGEN
> - tristate
> - prompt "sepolgen"
> - select PYTHON
> - select LIBSELINUX
> - select LIBSELINUX_PYTHON
> - help
> - A Python module used in SELinux policy generation
> -
> - This package contains a Python module that forms the core of
> - the modern audit2allow (which is a part of the package
> - policycoreutils). The sepolgen library is structured to give
> - flexibility to the application using it. The library
> - contains: Reference Policy Representation, which are Objects
> - for representing policies and the reference policy
> - interfaces. Secondly, it has objects and algorithms for
> - representing access and sets of access in an abstract way
> - and searching that access. It also has a parser for
> - reference policy "headers". It contains infrastructure for
> - parsing SELinux related messages as produced by the audit
> - system. It has facilities for generating policy based on
> - required access.
> -
> - STAGING: remove in ptxdist-2020.06.0
> - Old version that needs to be updated.
> diff --git a/rules/sepolgen.make b/rules/sepolgen.make
> deleted file mode 100644
> index 7084e1d1d348..000000000000
> --- a/rules/sepolgen.make
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen
> -
> -#
> -# Paths and names
> -#
> -SEPOLGEN_VERSION := 1.1.8
> -SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d
> -SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION)
> -SEPOLGEN_SUFFIX := tar.gz
> -SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
> -SEPOLGEN_SOURCE := $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
> -SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN)
> -SEPOLGEN_LICENSE := GPL-2.0-only
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -SEPOLGEN_CONF_TOOL := NO
> -# no ':=' because of $(PYTHON_SITEPACKAGES)
> -SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/sepolgen.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, sepolgen)
> - @$(call install_fixup, sepolgen,PRIORITY,optional)
> - @$(call install_fixup, sepolgen,SECTION,base)
> - @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
> - @$(call install_fixup, sepolgen,DESCRIPTION,missing)
> -
> - @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES))
> - @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map)
> -
> - @$(call install_finish, sepolgen)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
> --
> 2.27.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* [ptxdist] [PATCH v2] sepolgen: remove after one year in staging
2020-07-06 6:38 ` Michael Olbrich
@ 2020-07-06 12:49 ` Roland Hieber
2020-07-07 5:45 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 16+ messages in thread
From: Roland Hieber @ 2020-07-06 12:49 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
On Mon, Jul 06, 2020 at 08:38:40AM +0200, Michael Olbrich wrote:
> .../ptxdist/rules/policycoreutils.in:14:warning: 'select' used by config symbol 'POLICYCOREUTILS' refers to undefined symbol 'SEPOLGEN'
Hmm. Not sure what to do here, so I've removed the select line now. Is
this better?
- Roland
rules/policycoreutils.in | 4 +--
rules/sepolgen.in | 29 ---------------------
rules/sepolgen.make | 54 ----------------------------------------
3 files changed, 2 insertions(+), 85 deletions(-)
delete mode 100644 rules/sepolgen.in
delete mode 100644 rules/sepolgen.make
diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
index 856b50046d5b..fce42b002821 100644
--- a/rules/policycoreutils.in
+++ b/rules/policycoreutils.in
@@ -11,7 +11,6 @@ menuconfig POLICYCOREUTILS
select LIBSEMANAGE
select LIBSEPOL
select DBUS_GLIB if POLICYCOREUTILS_RESTORECOND
- select SEPOLGEN if POLICYCOREUTILS_PYTHON
select BUSYBOX_FEATURE_FIND_DEPTH if BUSYBOX_FIND
select BUSYBOX_FEATURE_FIND_DELETE if BUSYBOX_FIND
select BUSYBOX_SELINUX if BUSYBOX_FIND
@@ -29,7 +28,8 @@ menuconfig POLICYCOREUTILS
if POLICYCOREUTILS
menuconfig POLICYCOREUTILS_PYTHON
- depends on STAGING
+ # needs sepolgen
+ depends on BROKEN
bool "python based tools"
if POLICYCOREUTILS_PYTHON
diff --git a/rules/sepolgen.in b/rules/sepolgen.in
deleted file mode 100644
index 94f2ce071ab8..000000000000
--- a/rules/sepolgen.in
+++ /dev/null
@@ -1,29 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=selinux
-
-config SEPOLGEN
- tristate
- prompt "sepolgen"
- select PYTHON
- select LIBSELINUX
- select LIBSELINUX_PYTHON
- help
- A Python module used in SELinux policy generation
-
- This package contains a Python module that forms the core of
- the modern audit2allow (which is a part of the package
- policycoreutils). The sepolgen library is structured to give
- flexibility to the application using it. The library
- contains: Reference Policy Representation, which are Objects
- for representing policies and the reference policy
- interfaces. Secondly, it has objects and algorithms for
- representing access and sets of access in an abstract way
- and searching that access. It also has a parser for
- reference policy "headers". It contains infrastructure for
- parsing SELinux related messages as produced by the audit
- system. It has facilities for generating policy based on
- required access.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that needs to be updated.
diff --git a/rules/sepolgen.make b/rules/sepolgen.make
deleted file mode 100644
index 7084e1d1d348..000000000000
--- a/rules/sepolgen.make
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen
-
-#
-# Paths and names
-#
-SEPOLGEN_VERSION := 1.1.8
-SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d
-SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION)
-SEPOLGEN_SUFFIX := tar.gz
-SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
-SEPOLGEN_SOURCE := $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
-SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN)
-SEPOLGEN_LICENSE := GPL-2.0-only
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-SEPOLGEN_CONF_TOOL := NO
-# no ':=' because of $(PYTHON_SITEPACKAGES)
-SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/sepolgen.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, sepolgen)
- @$(call install_fixup, sepolgen,PRIORITY,optional)
- @$(call install_fixup, sepolgen,SECTION,base)
- @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
- @$(call install_fixup, sepolgen,DESCRIPTION,missing)
-
- @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES))
- @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map)
-
- @$(call install_finish, sepolgen)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [ptxdist] [APPLIED] sepolgen: remove after one year in staging
2020-07-06 12:49 ` [ptxdist] [PATCH v2] " Roland Hieber
@ 2020-07-07 5:45 ` Michael Olbrich
0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2020-07-07 5:45 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 9fe5462616de2ce93663f409f471ea83a6d5fbb5.
Michael
[sent from post-receive hook]
On Tue, 07 Jul 2020 07:45:55 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200706124924.23351-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
> index 856b50046d5b..fce42b002821 100644
> --- a/rules/policycoreutils.in
> +++ b/rules/policycoreutils.in
> @@ -11,7 +11,6 @@ menuconfig POLICYCOREUTILS
> select LIBSEMANAGE
> select LIBSEPOL
> select DBUS_GLIB if POLICYCOREUTILS_RESTORECOND
> - select SEPOLGEN if POLICYCOREUTILS_PYTHON
> select BUSYBOX_FEATURE_FIND_DEPTH if BUSYBOX_FIND
> select BUSYBOX_FEATURE_FIND_DELETE if BUSYBOX_FIND
> select BUSYBOX_SELINUX if BUSYBOX_FIND
> @@ -29,7 +28,8 @@ menuconfig POLICYCOREUTILS
> if POLICYCOREUTILS
>
> menuconfig POLICYCOREUTILS_PYTHON
> - depends on STAGING
> + # needs sepolgen
> + depends on BROKEN
> bool "python based tools"
>
> if POLICYCOREUTILS_PYTHON
> diff --git a/rules/sepolgen.in b/rules/sepolgen.in
> deleted file mode 100644
> index 94f2ce071ab8..000000000000
> --- a/rules/sepolgen.in
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=selinux
> -
> -config SEPOLGEN
> - tristate
> - prompt "sepolgen"
> - select PYTHON
> - select LIBSELINUX
> - select LIBSELINUX_PYTHON
> - help
> - A Python module used in SELinux policy generation
> -
> - This package contains a Python module that forms the core of
> - the modern audit2allow (which is a part of the package
> - policycoreutils). The sepolgen library is structured to give
> - flexibility to the application using it. The library
> - contains: Reference Policy Representation, which are Objects
> - for representing policies and the reference policy
> - interfaces. Secondly, it has objects and algorithms for
> - representing access and sets of access in an abstract way
> - and searching that access. It also has a parser for
> - reference policy "headers". It contains infrastructure for
> - parsing SELinux related messages as produced by the audit
> - system. It has facilities for generating policy based on
> - required access.
> -
> - STAGING: remove in ptxdist-2020.06.0
> - Old version that needs to be updated.
> diff --git a/rules/sepolgen.make b/rules/sepolgen.make
> deleted file mode 100644
> index 7084e1d1d348..000000000000
> --- a/rules/sepolgen.make
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen
> -
> -#
> -# Paths and names
> -#
> -SEPOLGEN_VERSION := 1.1.8
> -SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d
> -SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION)
> -SEPOLGEN_SUFFIX := tar.gz
> -SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
> -SEPOLGEN_SOURCE := $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
> -SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN)
> -SEPOLGEN_LICENSE := GPL-2.0-only
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -SEPOLGEN_CONF_TOOL := NO
> -# no ':=' because of $(PYTHON_SITEPACKAGES)
> -SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/sepolgen.targetinstall:
> - @$(call targetinfo)
> -
> - @$(call install_init, sepolgen)
> - @$(call install_fixup, sepolgen,PRIORITY,optional)
> - @$(call install_fixup, sepolgen,SECTION,base)
> - @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
> - @$(call install_fixup, sepolgen,DESCRIPTION,missing)
> -
> - @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES))
> - @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map)
> -
> - @$(call install_finish, sepolgen)
> -
> - @$(call touch)
> -
> -# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2020-07-07 5:45 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-21 22:29 [ptxdist] [PATCH 1/5] ustr: move to staging Roland Hieber
2020-06-21 22:29 ` [ptxdist] [PATCH 2/5] dc3dd: remove after one year in staging Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-21 22:29 ` [ptxdist] [PATCH 3/5] mono: " Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-21 22:29 ` [ptxdist] [PATCH 4/5] sepolgen: " Roland Hieber
2020-06-22 12:26 ` Michael Olbrich
2020-06-22 12:56 ` Ladislav Michl
2020-06-28 21:20 ` [ptxdist] [PATCH v2] " Roland Hieber
2020-06-28 21:24 ` [ptxdist] [PATCH v3] " Roland Hieber
2020-07-06 6:38 ` Michael Olbrich
2020-07-06 12:49 ` [ptxdist] [PATCH v2] " Roland Hieber
2020-07-07 5:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-21 22:29 ` [ptxdist] [PATCH 5/5] udisks: " Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-26 11:00 ` [ptxdist] [APPLIED] ustr: move to staging Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox