Commit 073e2d6d043b0fa693633cadc25b2776d5827a7c - python-faraday

Switch to Python 3 Sophie Brun 4 years ago

6 changed file(s) with 81 addition(s) and 82 deletion(s). Raw diff Collapse all Expand all

+51

-52

debian/control less more

4	4	Uploaders: Sophie Brun <[email protected]>
5	5	Build-Depends: debhelper-compat (= 12),
6	6	dh-python,
7		python,
8		python-alembic,
9		python-autobahn,
10		python-bcrypt,
11		python-bs4,
12		python-deprecation,
13		python-factory-boy,
14		python-filedepot,
15		python-filteralchemy,
16		python-flask,
17		python-flask-classful,
18		python-flask-kvsession,
19		python-flask-principal,
20		python-flask-restless,
21		python-flask-security,
22		python-flask-session,
23		python-flask-sqlalchemy (>=2.3.0),
24		python-future,
25		python-html2text,
26		python-hypothesis,
27		python-ipy,
28		python-lxml,
29		python-marshmallow,
30		python-marshmallow-sqlalchemy,
31		python-mock,
32		python-mockito,
33		python-nplusone,
34		python-pcapfile,
35		python-pil,
36		python-pytest,
37		python-pytest-factoryboy,
38		python-pytest-runner,
39		python-requests,
40		python-responses,
41		python-setuptools,
42		python-simplekv,
43		python-sphinx,
44		python-sqlalchemy,
45		python-sqlalchemy-schemadisplay,
46		python-syslog-rfc5424-formatter,
47		python-tornado,
48		python-tqdm,
49		python-twisted,
50		python-typing,
51		python-tz,
52		python-webargs,
53		python-websocket
	7	python3,
	8	python3-alembic,
	9	python3-autobahn,
	10	python3-bcrypt,
	11	python3-bs4,
	12	python3-deprecation,
	13	python3-factory-boy,
	14	python3-filedepot,
	15	python3-filteralchemy,
	16	python3-flask,
	17	python3-flask-classful,
	18	python3-flask-kvsession,
	19	python3-flask-principal,
	20	python3-flask-restless,
	21	python3-flask-security,
	22	python3-flask-session,
	23	python3-flask-sqlalchemy (>=2.3.0),
	24	python3-future,
	25	python3-html2text,
	26	python3-hypothesis,
	27	python3-ipy,
	28	python3-lxml,
	29	python3-marshmallow,
	30	python3-marshmallow-sqlalchemy,
	31	python3-mock,
	32	python3-mockito,
	33	python3-nplusone,
	34	python3-pcapfile,
	35	python3-pil,
	36	python3-pytest,
	37	python3-pytest-factoryboy,
	38	python3-pytest-runner,
	39	python3-requests,
	40	python3-responses,
	41	python3-setuptools,
	42	python3-simplekv,
	43	python3-sphinx,
	44	python3-sqlalchemy,
	45	python3-sqlalchemy-schemadisplay,
	46	python3-syslog-rfc5424-formatter,
	47	python3-tornado,
	48	python3-tqdm,
	49	python3-twisted,
	50	python3-tz,
	51	python3-webargs,
	52	python3-websocket
54	53	Standards-Version: 4.4.1
55	54	Homepage: https://faradaysec.com
56	55	Vcs-Git: https://gitlab.com/kalilinux/packages/python-faraday.git

62	61	gir1.2-gtk-3.0,
63	62	gir1.2-vte-2.91,
64	63	postgresql,
65		python-gobject,
66		python-tornado,
	64	python3-gobject,
	65	python3-tornado,
67	66	sudo,
68	67	zsh \| zsh-beta,
69	68	${misc:Depends},
70		${python:Depends},
	69	${python3:Depends},
71	70	${shlibs:Depends}
72	71	Recommends: fonts-font-awesome,
73	72	fonts-glyphicons-halflings,
74		python-bs4,
75		python-selenium,
	73	python3-bs4,
	74	python3-selenium,
76	75	ruby \| ruby-interpreter
77	76	Description: Collaborative Penetration Test IDE
78	77	Faraday introduces a new concept (IPE) Integrated Penetration-Test Environment

-1

debian/python-faraday.install less more

0	0	debian/helper-script/* usr/bin
1		debian/migrate-database usr/lib/python2.7/dist-packages/faraday/debian-scripts
	1	debian/migrate-database usr/lib/python3/dist-packages/faraday/debian-scripts

-5

debian/python-faraday.links less more

0	0	usr/bin/faraday usr/bin/python-faraday
1		usr/share/fonts-glyphicons/glyphicons-halflings-regular.eot usr/lib/python2.7/dist-packages/faraday/server/www/fonts/glyphicons-halflings-regular.eot
2		usr/share/fonts-glyphicons/glyphicons-halflings-regular.ttf usr/lib/python2.7/dist-packages/faraday/server/www/fonts/glyphicons-halflings-regular.ttf
3		usr/share/fonts-glyphicons/glyphicons-halflings-regular.woff usr/lib/python2.7/dist-packages/faraday/server/www/fonts/glyphicons-halflings-regular.woff
4		usr/share/fonts-glyphicons/glyphicons-halflings-regular.woff2 usr/lib/python2.7/dist-packages/faraday/server/www/fonts/glyphicons-halflings-regular.woff2
5		usr/share/fonts/truetype/glyphicons/glyphicons-halflings-regular.svg usr/lib/python2.7/dist-packages/faraday/server/www/fonts/font-awesome/fontawesome-webfont.svg
	1	usr/share/fonts-glyphicons/glyphicons-halflings-regular.eot usr/lib/python3/dist-packages/faraday/server/www/fonts/glyphicons-halflings-regular.eot
	2	usr/share/fonts-glyphicons/glyphicons-halflings-regular.ttf usr/lib/python3/dist-packages/faraday/server/www/fonts/glyphicons-halflings-regular.ttf
	3	usr/share/fonts-glyphicons/glyphicons-halflings-regular.woff usr/lib/python3/dist-packages/faraday/server/www/fonts/glyphicons-halflings-regular.woff
	4	usr/share/fonts-glyphicons/glyphicons-halflings-regular.woff2 usr/lib/python3/dist-packages/faraday/server/www/fonts/glyphicons-halflings-regular.woff2
	5	usr/share/fonts/truetype/glyphicons/glyphicons-halflings-regular.svg usr/lib/python3/dist-packages/faraday/server/www/fonts/font-awesome/fontawesome-webfont.svg

+14

-14

debian/python-faraday.lintian-overrides less more

0	0	# False-positive
1		python-faraday: extra-license-file usr/lib/python2.7/dist-packages/faraday/server/www/scripts/licenses/providers/license.js
	1	python-faraday: extra-license-file usr/lib/python3/dist-packages/faraday/server/www/scripts/licenses/providers/license.js
2	2	# don't use Debian package: versions are too different
3		python-faraday: embedded-javascript-library usr/lib/python2.7/dist-packages/faraday/server/www/normalize.css please use libjs-normalize
4		python-faraday: embedded-javascript-library usr/lib/python2.7/dist-packages/faraday/server/www/script/jquery-1.11.2.js please use libjs-jquery
5		python-faraday: embedded-javascript-library usr/lib/python2.7/dist-packages/faraday/server/www/script/jquery-1.9.1.js please use libjs-jquery
6		python-faraday: embedded-javascript-library usr/lib/python2.7/dist-packages/faraday/server/www/script/jquery.js please use libjs-jquery
7		python-faraday: embedded-javascript-library usr/lib/python2.7/dist-packages/faraday/server/www/script/jquery.tablesorter.min.js please use libjs-jquery-tablesorter
	3	python-faraday: embedded-javascript-library usr/lib/python3/dist-packages/faraday/server/www/normalize.css please use libjs-normalize
	4	python-faraday: embedded-javascript-library usr/lib/python3/dist-packages/faraday/server/www/script/jquery-1.11.2.js please use libjs-jquery
	5	python-faraday: embedded-javascript-library usr/lib/python3/dist-packages/faraday/server/www/script/jquery-1.9.1.js please use libjs-jquery
	6	python-faraday: embedded-javascript-library usr/lib/python3/dist-packages/faraday/server/www/script/jquery.js please use libjs-jquery
	7	python-faraday: embedded-javascript-library usr/lib/python3/dist-packages/faraday/server/www/script/jquery.tablesorter.min.js please use libjs-jquery-tablesorter
8	8	# fonts are not packaged, just install them in python-faraday
9		python-faraday: font-in-non-font-package usr/lib/python2.7/dist-packages/faraday/server/www/fonts/flexslider*
10		python-faraday: font-outside-font-dir usr/lib/python2.7/dist-packages/faraday/server/www/fonts/flexslider*
11		python-faraday: font-in-non-font-package usr/lib/python2.7/dist-packages/faraday/server/www/fonts/opensans*
12		python-faraday: font-outside-font-dir usr/lib/python2.7/dist-packages/faraday/server/www/fonts/opensans*
13		python-faraday: font-in-non-font-package usr/lib/python2.7/dist-packages/faraday/server/www/fonts/ubuntu*
14		python-faraday: font-outside-font-dir usr/lib/python2.7/dist-packages/faraday/server/www/fonts/ubuntu*
15		python-faraday: font-in-non-font-package usr/lib/python2.7/dist-packages/faraday/server/www/script/ui-grid.woff
16		python-faraday: font-outside-font-dir usr/lib/python2.7/dist-packages/faraday/server/www/script/ui-grid.woff
	9	python-faraday: font-in-non-font-package usr/lib/python3/dist-packages/faraday/server/www/fonts/flexslider*
	10	python-faraday: font-outside-font-dir usr/lib/python3/dist-packages/faraday/server/www/fonts/flexslider*
	11	python-faraday: font-in-non-font-package usr/lib/python3/dist-packages/faraday/server/www/fonts/opensans*
	12	python-faraday: font-outside-font-dir usr/lib/python3/dist-packages/faraday/server/www/fonts/opensans*
	13	python-faraday: font-in-non-font-package usr/lib/python3/dist-packages/faraday/server/www/fonts/ubuntu*
	14	python-faraday: font-outside-font-dir usr/lib/python3/dist-packages/faraday/server/www/fonts/ubuntu*
	15	python-faraday: font-in-non-font-package usr/lib/python3/dist-packages/faraday/server/www/script/ui-grid.woff
	16	python-faraday: font-outside-font-dir usr/lib/python3/dist-packages/faraday/server/www/script/ui-grid.woff

-1

debian/python-faraday.postinst less more

9	9	rm -f /usr/share/python-faraday/external_libs
10	10	fi
11	11	if [ "$1" = "configure" ] && [ -n "$2" ]; then
12		./usr/lib/python2.7/dist-packages/faraday/debian-scripts/migrate-database
	12	./usr/lib/python3/dist-packages/faraday/debian-scripts/migrate-database
13	13	fi
14	14
15	15	#DEBHELPER#

-9

debian/rules less more

3	3	export PYBUILD_TEST_ARGS="-k-TestGetExploits -k-test_update_command -k-test_start_and_kill_faraday_server-k-test_create_agent_without_name_fails -k-test_create_agent_invalid_payload"
4	4
5	5	%:
6		dh $@ --with python2,sphinxdoc --buildsystem=pybuild
	6	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
7	7
8	8	override_dh_auto_build:
9	9	dh_auto_build

12	12	override_dh_auto_install:
13	13	dh_auto_install
14	14	# remove unwanted files: .gitignore and useless README
15		rm debian/python-faraday/usr/lib/python2.7/dist-packages/faraday/migrations/versions/.gitignore
16		rm debian/python-faraday/usr/lib/python2.7/dist-packages/faraday/server/www/scripts/config/.gitignore
17		rm debian/python-faraday/usr/lib/python2.7/dist-packages/faraday/migrations/README
	15	rm debian/python-faraday/usr/lib/python3*/dist-packages/faraday/migrations/versions/.gitignore
	16	rm debian/python-faraday/usr/lib/python3*/dist-packages/faraday/server/www/scripts/config/.gitignore
	17	rm debian/python-faraday/usr/lib/python3*/dist-packages/faraday/migrations/README
18	18
19	19	override_dh_link:
20	20	# remove the existing dirs to create symlinks instead
21		rm -r debian/python-faraday/usr/lib/python2.7/dist-packages/faraday/server/www/fonts/font-awesome
	21	rm -r debian/python-faraday/usr/lib/python3*/dist-packages/faraday/server/www/fonts/font-awesome
22	22	dh_link
23	23
24	24	override_dh_fixperms:
25	25	dh_fixperms
26		chmod 644 debian/python-faraday/usr/lib/python2.7/dist-packages/faraday/server/www/images/*
27		chmod 644 debian/python-faraday/usr/lib/python2.7/dist-packages/faraday/server/www/script/angular-chart.css.map
28		chmod 644 debian/python-faraday/usr/lib/python2.7/dist-packages/faraday/server/www/scripts/statusReport/providers/logical.pegjs
29		chmod 644 debian/python-faraday/usr/lib/python2.7/dist-packages/faraday/server/www/fonts/flexslider*
	26	chmod 644 debian/python-faraday/usr/lib/python3/dist-packages/faraday/server/www/images/
	27	chmod 644 debian/python-faraday/usr/lib/python3*/dist-packages/faraday/server/www/script/angular-chart.css.map
	28	chmod 644 debian/python-faraday/usr/lib/python3*/dist-packages/faraday/server/www/scripts/statusReport/providers/logical.pegjs
	29	chmod 644 debian/python-faraday/usr/lib/python3/dist-packages/faraday/server/www/fonts/flexslider
30	30
31	31	override_dh_installchangelogs:
32	32	dh_installchangelogs RELEASE.md