URL: https://github.com/freeipa/freeipa/pull/472
Author: tiran
Title: #472: Packaging: Add placeholder packages
Action: opened
PR body:
"""
The ipa and freeipa packages are placeholders to prevent PyPI squashing
attacks and reserve the names for future use. `pip install ipa` installs
ipaclient.
Signed-off-by: Christian Heimes <chei...@redhat.com>
The new PR provides just the two placeholder packages from PR #379.
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/472/head:pr472
git checkout pr472
From 12184517863aef5dd29ed4705d33ca1eedea3220 Mon Sep 17 00:00:00 2001
From: Christian Heimes <chei...@redhat.com>
Date: Thu, 16 Feb 2017 15:27:49 +0100
Subject: [PATCH] Packaging: Add placeholder packages
The ipa and freeipa packages are placeholders to prevent PyPI squashing
attacks and reserve the names for future use. `pip install ipa` installs
ipaclient.
Signed-off-by: Christian Heimes <chei...@redhat.com>
---
Makefile.am | 4 +++-
Makefile.python.am | 21 +++++++++++++--------
configure.ac | 3 +++
packaging/Makefile.am | 10 ++++++++++
packaging/freeipa/Makefile.am | 3 +++
packaging/freeipa/README.txt | 2 ++
packaging/freeipa/setup.cfg | 6 ++++++
packaging/freeipa/setup.py | 23 +++++++++++++++++++++++
packaging/ipa/Makefile.am | 3 +++
packaging/ipa/README.txt | 2 ++
packaging/ipa/setup.cfg | 6 ++++++
packaging/ipa/setup.py | 23 +++++++++++++++++++++++
12 files changed, 97 insertions(+), 9 deletions(-)
create mode 100644 packaging/Makefile.am
create mode 100644 packaging/freeipa/Makefile.am
create mode 100644 packaging/freeipa/README.txt
create mode 100644 packaging/freeipa/setup.cfg
create mode 100755 packaging/freeipa/setup.py
create mode 100644 packaging/ipa/Makefile.am
create mode 100644 packaging/ipa/README.txt
create mode 100644 packaging/ipa/setup.cfg
create mode 100755 packaging/ipa/setup.py
diff --git a/Makefile.am b/Makefile.am
index 30ad9bb..a6faa11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
IPACLIENT_SUBDIRS = ipaclient ipalib ipapython
-SUBDIRS = asn1 util client contrib daemons init install $(IPACLIENT_SUBDIRS) ipaplatform ipaserver ipatests po
+SUBDIRS = asn1 util client contrib daemons init install $(IPACLIENT_SUBDIRS) ipaplatform ipaserver ipatests packaging po
MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo \
ignore_import_errors.pyc ignore_import_errors.pyo \
@@ -206,6 +206,8 @@ $(WHEELBUNDLEDIR):
mkdir -p $(WHEELBUNDLEDIR)
bdist_wheel: $(WHEELDISTDIR)
+ $(MAKE) $(AM_MAKEFLAGS) -C packaging/ipa bdist_wheel || exit 1;
+ $(MAKE) $(AM_MAKEFLAGS) -C packaging/freeipa bdist_wheel || exit 1;
for dir in $(IPACLIENT_SUBDIRS); do \
$(MAKE) $(AM_MAKEFLAGS) -C $${dir} $@ || exit 1; \
done
diff --git a/Makefile.python.am b/Makefile.python.am
index 665893f..9c34fe3 100644
--- a/Makefile.python.am
+++ b/Makefile.python.am
@@ -1,5 +1,6 @@
pkgname = $(shell basename "$(abs_srcdir)")
pkgpythondir = $(pythondir)/$(pkgname)
+pkginstall = true
if VERBOSE_MAKE
VERBOSITY="--verbose"
@@ -19,16 +20,20 @@ all-local: $(top_builddir)/ipasetup.py
--build-base "$(abs_builddir)/build"
install-exec-local: $(top_builddir)/ipasetup.py
- $(PYTHON) $(srcdir)/setup.py \
- $(VERBOSITY) \
- install \
- --prefix "$(DESTDIR)$(prefix)" \
- --single-version-externally-managed \
- --record "$(DESTDIR)$(pkgpythondir)/install_files.txt" \
- --optimize 1
+ if [ "x$(pkginstall)" = "xtrue" ]; then \
+ $(PYTHON) $(srcdir)/setup.py \
+ $(VERBOSITY) \
+ install \
+ --prefix "$(DESTDIR)$(prefix)" \
+ --single-version-externally-managed \
+ --record "$(DESTDIR)$(pkgpythondir)/install_files.txt" \
+ --optimize 1; \
+ fi
uninstall-local:
- cat "$(DESTDIR)$(pkgpythondir)/install_files.txt" | xargs rm -rf
+ if [ -f "$(DESTDIR)$(pkgpythondir)/install_files.txt" ]; then \
+ cat "$(DESTDIR)$(pkgpythondir)/install_files.txt" | xargs rm -rf ; \
+ fi
rm -rf "$(DESTDIR)$(pkgpythondir)"
clean-local: $(top_builddir)/ipasetup.py
diff --git a/configure.ac b/configure.ac
index 44dc11b..f48ba14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,6 +577,9 @@ AC_CONFIG_FILES([
ipaserver/Makefile
ipatests/Makefile
ipatests/man/Makefile
+ packaging/Makefile
+ packaging/freeipa/Makefile
+ packaging/ipa/Makefile
po/Makefile.in
po/Makefile.hack
util/Makefile
diff --git a/packaging/Makefile.am b/packaging/Makefile.am
new file mode 100644
index 0000000..5725ed9
--- /dev/null
+++ b/packaging/Makefile.am
@@ -0,0 +1,10 @@
+# This file will be processed with automake-1.7 to create Makefile.in
+#
+AUTOMAKE_OPTIONS = 1.7 subdir-objects
+
+NULL =
+
+SUBDIRS = \
+ freeipa \
+ ipa \
+ $(NULL)
diff --git a/packaging/freeipa/Makefile.am b/packaging/freeipa/Makefile.am
new file mode 100644
index 0000000..15d86ce
--- /dev/null
+++ b/packaging/freeipa/Makefile.am
@@ -0,0 +1,3 @@
+include $(top_srcdir)/Makefile.python.am
+
+pkginstall = false
diff --git a/packaging/freeipa/README.txt b/packaging/freeipa/README.txt
new file mode 100644
index 0000000..b58448f
--- /dev/null
+++ b/packaging/freeipa/README.txt
@@ -0,0 +1,2 @@
+This is a dummy package for FreeIPA's ipaclient.
+
diff --git a/packaging/freeipa/setup.cfg b/packaging/freeipa/setup.cfg
new file mode 100644
index 0000000..62f65c7
--- /dev/null
+++ b/packaging/freeipa/setup.cfg
@@ -0,0 +1,6 @@
+[bdist_wheel]
+universal = 1
+
+[aliases]
+packages = clean --all egg_info bdist_wheel
+release = packages register upload
diff --git a/packaging/freeipa/setup.py b/packaging/freeipa/setup.py
new file mode 100755
index 0000000..230fffd
--- /dev/null
+++ b/packaging/freeipa/setup.py
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
+#
+"""Dummy package for FreeIPA
+
+Please install ipaclient instead.
+"""
+
+from os.path import abspath, dirname
+import sys
+
+if __name__ == '__main__':
+ # include ../../ for ipasetup.py
+ sys.path.append(dirname(dirname(dirname(abspath(__file__)))))
+ from ipasetup import ipasetup # noqa: E402
+
+ ipasetup(
+ name='freeipa',
+ doc = __doc__,
+ install_requires=[
+ "ipaclient",
+ ]
+ )
diff --git a/packaging/ipa/Makefile.am b/packaging/ipa/Makefile.am
new file mode 100644
index 0000000..15d86ce
--- /dev/null
+++ b/packaging/ipa/Makefile.am
@@ -0,0 +1,3 @@
+include $(top_srcdir)/Makefile.python.am
+
+pkginstall = false
diff --git a/packaging/ipa/README.txt b/packaging/ipa/README.txt
new file mode 100644
index 0000000..b58448f
--- /dev/null
+++ b/packaging/ipa/README.txt
@@ -0,0 +1,2 @@
+This is a dummy package for FreeIPA's ipaclient.
+
diff --git a/packaging/ipa/setup.cfg b/packaging/ipa/setup.cfg
new file mode 100644
index 0000000..62f65c7
--- /dev/null
+++ b/packaging/ipa/setup.cfg
@@ -0,0 +1,6 @@
+[bdist_wheel]
+universal = 1
+
+[aliases]
+packages = clean --all egg_info bdist_wheel
+release = packages register upload
diff --git a/packaging/ipa/setup.py b/packaging/ipa/setup.py
new file mode 100755
index 0000000..403389b
--- /dev/null
+++ b/packaging/ipa/setup.py
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
+#
+"""Dummy package for FreeIPA
+
+Please install ipaclient instead.
+"""
+
+from os.path import abspath, dirname
+import sys
+
+if __name__ == '__main__':
+ # include ../../ for ipasetup.py
+ sys.path.append(dirname(dirname(dirname(abspath(__file__)))))
+ from ipasetup import ipasetup # noqa: E402
+
+ ipasetup(
+ name='ipa',
+ doc = __doc__,
+ install_requires=[
+ "ipaclient",
+ ]
+ )
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
