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 <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Christian Heimes authored and Martin Basti committed 2017-03-02 14:43:37 +01:00
1 parent ed7a03a1af
commit 2e784336b0
12 files changed
+97 -11

No files matched your search

+3 -3
View File
@@ -9,11 +9,9 @@ if WITH_IPATESTS
endif
IPACLIENT_SUBDIRS = ipaclient ipalib ipapython
SUBDIRS = asn1 util client contrib po \
SUBDIRS = asn1 util client contrib po pypi \
$(IPACLIENT_SUBDIRS) ipaplatform $(IPATESTS_SUBDIRS) $(SERVER_SUBDIRS)
MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo \
ignore_import_errors.pyc ignore_import_errors.pyo \
ipasetup.pyc ipasetup.pyo \
@@ -217,6 +215,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
+13 -8
View File
@@ -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
+3
View File
@@ -487,6 +487,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
+10
View File
@@ -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)
+3
View File
@@ -0,0 +1,3 @@
include $(top_srcdir)/Makefile.python.am
pkginstall = false
+2
View File
@@ -0,0 +1,2 @@
This is a dummy package for FreeIPA's ipaclient.
+6
View File
@@ -0,0 +1,6 @@
[bdist_wheel]
universal = 1
[aliases]
packages = clean --all egg_info bdist_wheel
release = packages register upload
+23
View File
@@ -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",
]
)
+3
View File
@@ -0,0 +1,3 @@
include $(top_srcdir)/Makefile.python.am
pkginstall = false
+2
View File
@@ -0,0 +1,2 @@
This is a dummy package for FreeIPA's ipaclient.
+6
View File
@@ -0,0 +1,6 @@
[bdist_wheel]
universal = 1
[aliases]
packages = clean --all egg_info bdist_wheel
release = packages register upload
+23
View File
@@ -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",
]
)