From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-admin/webapp-config/Manifest | 16 ++ .../files/webapp-config-1.52-nulls-doctest.patch | 185 +++++++++++++++++++++ ...-1.53-sources-function.sh-from-lib-gentoo.patch | 25 +++ .../files/webapp-config-1.54-fix-bashism.patch | 12 ++ .../files/webapp-config-1.54-pvr-check.patch | 49 ++++++ app-admin/webapp-config/metadata.xml | 22 +++ .../webapp-config/webapp-config-1.52-r1.ebuild | 64 +++++++ .../webapp-config/webapp-config-1.53-r2.ebuild | 67 ++++++++ .../webapp-config/webapp-config-1.54-r2.ebuild | 65 ++++++++ app-admin/webapp-config/webapp-config-1.55.ebuild | 65 ++++++++ app-admin/webapp-config/webapp-config-9999.ebuild | 72 ++++++++ 11 files changed, 642 insertions(+) create mode 100644 app-admin/webapp-config/Manifest create mode 100644 app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch create mode 100644 app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch create mode 100644 app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch create mode 100644 app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch create mode 100644 app-admin/webapp-config/metadata.xml create mode 100644 app-admin/webapp-config/webapp-config-1.52-r1.ebuild create mode 100644 app-admin/webapp-config/webapp-config-1.53-r2.ebuild create mode 100644 app-admin/webapp-config/webapp-config-1.54-r2.ebuild create mode 100644 app-admin/webapp-config/webapp-config-1.55.ebuild create mode 100644 app-admin/webapp-config/webapp-config-9999.ebuild (limited to 'app-admin/webapp-config') diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest new file mode 100644 index 000000000000..8c0fea220c17 --- /dev/null +++ b/app-admin/webapp-config/Manifest @@ -0,0 +1,16 @@ +AUX webapp-config-1.52-nulls-doctest.patch 9054 SHA256 d29b81b0c5836e0258a5cf6f3f6e44b92a861e5f181c6acb7f2c3d897fe9a997 SHA512 3e1fa14a1db1a3c6fe505d846e40c47b91d75ffea52daf4f34e9da0713b954b47264d0b4f068e9736bc3d100ee981b461888b9ee8cde9103dcd86eb1b5f5a47f WHIRLPOOL bfa1728d72bba541f516263118d4cf3233b64d41ece32380c8096f33e08f6a6d102496982da95417391cfdd2f9a6d0add33a1ac683251e89b46e431fc49f8c2c +AUX webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch 756 SHA256 83ad478f41ee6a6035a5c3d492129cee8dc28ce068216ca36db8e7ce323e04b9 SHA512 e67f8e055bd0af7b97eade6dfce40fac411374dc264952ef1f17ffb5a161eed015bbbee512e83e1b533cef352c7dc863a96fa2345ecedaaa72352ddb622b820d WHIRLPOOL 13f4d1462456d6dd6097fe36a537a931a751056ca5e9281cd2e7476311cbe4ce776305532d876bacf86f95b137d61d3d2691d624c75fa61d4d78ea8476371fee +AUX webapp-config-1.54-fix-bashism.patch 400 SHA256 546b22c9534946fe79a27509140f52197af2b58626f8c2149bf0d7e3f4887121 SHA512 2e5080199ded653e07cf0188ca16ad0a505e7dc8230176c2452a4b2934017d7a8696a5d4b2bfcbc92159b36602a391d9c270acf0b7178f10249f5141fa8e22af WHIRLPOOL b286e2df6c6dcfc40276cd8842feb46540910545e12fb292c9f08e0e2bc42aed89f2b2298449606df7393cf734fb72b494a2c741caf20387179c45d3be28504d +AUX webapp-config-1.54-pvr-check.patch 2095 SHA256 58d606273b33631fcfa3a4b444811a742a6dce7c1078efbbaa124787e80f0ae1 SHA512 ee1c38e467ae4670b84d7b8d1cd8d99544898f8816dcc1cce37afb7ae3b8ecdce49f1d61f7f2e2609ec1166c5dffaa639e0705c017f18d0c3b50e72baf99aa96 WHIRLPOOL 9d2bf46d6e353fb85b3f739016d276aec1fef029617e3e72a1a72c492459c9d7bcf3737bc90210892828ddb8dd6a18943a34a29d4f15392038f1bd81b90d7697 +DIST webapp-config-1.52.tar.bz2 62951 SHA256 b8295bbc518f68f60913fe2ee9232d77f1a10e21fcddffb8c4370546ba96a2a5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea WHIRLPOOL ca6484871e26acff6d14510a4a925672258f58c1c8c05c5207b78350b1cc787e29c6ea68c1af05b5c5aaebed12ce545e023f54acbdc7215678b30a2f14708eee +DIST webapp-config-1.53.tar.bz2 63429 SHA256 4d45b1452feb730cc55bfdce686277183acfd64ab6aef5fab82992d1a508263d SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820 WHIRLPOOL f12ca0f3fcee31de6e2ead3cd3685fa32c697d258324bf40fc2bfc2f1787c4e7cbd7290bbb5f5523515bff29cb78bece35fcad390e419cf5dd619e5efdafc1dc +DIST webapp-config-1.54.tar.bz2 58954 SHA256 7663c4f7ae0d4e7206e349f3bf79fed479c9971365363929f431c92ebd622d17 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31 WHIRLPOOL 417944147e0bdc7eb1575b10102230306f6c76652beeb0e2866d0fbe41b12bcdeb31421dd7551961db55f4fe4544ca5600c072cb74083621745c7c74fbfeec2e +DIST webapp-config-1.55.tar.bz2 72583 SHA256 222c41ac71b2991b078352fb8d09a0d458ff30b9c9729a2429165835c38c564b SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438 WHIRLPOOL 80d577e4398f6872129544221d58003beb5b5ce972c181a241ec96cfe0fe34975e7bef5a96acc40977320ad71cd4370ee58216c0517d78c1765f000a42d8ea56 +EBUILD webapp-config-1.52-r1.ebuild 1606 SHA256 ec375f61695e98d46bcda50ae64ee90f9b70fc408328f49bb3d2405b079c816f SHA512 bff85d0cd35afc3fc99525ea34db8a6a49c0aa56b91ba4e8a6ad5dab9f5a34880b7f193166c0cdc40d37e51741306e091a080dfb363cc5d5401a315fce0d4d79 WHIRLPOOL d22103f01849de8fa2ff2711289ec2a4acff676ae8ebd8226cd34236ea27b6be9cef7fe687a3516475808b96354d7cf2dd2ca44b2f3f8135df8d77b2b21787d9 +EBUILD webapp-config-1.53-r2.ebuild 1690 SHA256 806fce528a6e5497c027620f1c94cdade488c01a14d6d9d1a9ff609fbe2dffc8 SHA512 3d4ba6d9bfae336fab02b3fcd5b5d11b7c28dbdaf2d32594e98ad79c321914af33cc9c761d7fb7b6b4f734e35f8d47734712d2866ca7981e4c4b296135638b46 WHIRLPOOL 320bfd49b96067fca71ecf91823f1a2a40aa7104f5cb07d22a99268e083160227e537b84f1bd6a4a29ed869b83d27b9803d6cc40410a16a7fbf37563aea46e63 +EBUILD webapp-config-1.54-r2.ebuild 1743 SHA256 034b0465d8b61799a824dc926fab906acbe51c8be14ab722cf8a7d4f872fb1d2 SHA512 be5330d0ecd6d05d8a5a539baaffd1919079bbbf22eb508789ef306a0e9cdc513268a3ca19fde73ebc7182adff30b34813fe47d1226b8d66758fd6f2da8525d3 WHIRLPOOL 600c10a60b9b92b0b77e349e70c6bf7112eaf575a2e89a95264591c7857ee5a946004662494d01d88a9eba19290a2f2fe338dbc39f6ea0c124ae5badc1b86a74 +EBUILD webapp-config-1.55.ebuild 1689 SHA256 01f04365d38566db96b75098305d2306dd0b7b24338ba2f4bdcc8a2cb85f3842 SHA512 325cff7ee1c9fb154707362ec804960ba8c811a572ed8dce385fd5459a6bc0458649e8e227d7998598a11d913c76050098c91339a0b5630224fb9cbf07aff646 WHIRLPOOL 2931c779c083dd4c05383f263d0dd06d13598b8ff1f276568682b5d1a81678568d875dabf1317e7119b95faa02c005b1f5b57726b87aaf99edad3e19d16f2521 +EBUILD webapp-config-9999.ebuild 1813 SHA256 c39bc07162d97ddc375ef523e53f110f08ef2840ec0618e60682cc0e1cf66c5a SHA512 d5a13e8be44f2f7ab00f982e13efb00b23a03031c479cc6a2b2689e2cd84863a18f16db9acd5b9125230d39ebde03d3df2d36683f450fa73c41f27224ffa98c9 WHIRLPOOL 30acae1cd46d6e329413d254e61b001246c32e7d1a5e8dc1061faa8f5cf8a4cc2a884fcda7fd9d988155aa9731904ee309b77f449b98540a48e70b145ef492b4 +MISC ChangeLog 6846 SHA256 0fb102d9f20c8e99a5b735c13c03ebe044c912def12e807f408391b585838101 SHA512 7f762477c6f040b5d1c5118edfbb0e0231066739d604770b81647535c95f15ff82f4aa48f1ed23b1921dcf0b62ed492ef6ff68aa2465782967d93ec17d890425 WHIRLPOOL f3bf810d4c58dfeeea0e752278b53a5579e4175d9a3a1cd775f47b607a1b6508d5dea9bf486f922a1993f181c4e10dddf75d82a000b242471ed72540be4ade5a +MISC ChangeLog-2015 33731 SHA256 d4cc1f1abf8899a25b08b631c2568ca3f95e55a87361b7217e527d3cd7446e83 SHA512 b35e099b5cc42d3ac133b865196aac9a518553c0c1411d11bbe9fc00c8d0a730c8a3765154dd32343b3b8301d10ef49fea5a77051e958b96ac849c6b168564fd WHIRLPOOL cab9204309a29fa0dd7b13758a8cfcc6f3fe212bba31a56929ede46bdf456dc60203b86e2bf36096885371df2e60f992a8ec1e9f9d5a32b6bd39b7b4724291dc +MISC metadata.xml 661 SHA256 127398f31fe1913413f39613a60345db20cf49a92337cbaa7db25fd0aef4b2c3 SHA512 bd5161502c6e93cef50b1206247f26920d011d87ca9b9d83217f30a2c29e67728262804d42b13eeb956b69432adbf27d9f42ca75b48a92b6335c9eac25a9976c WHIRLPOOL 52026ad4d9477fe718a52e5a72aa7507f2144b7ff4d6b270d3d6994c9914f2fe7003440568af028e2ec9ee93643e80097bda79f17f83b2b644b12b15ec51b0c6 diff --git a/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch b/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch new file mode 100644 index 000000000000..97c64a90df25 --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch @@ -0,0 +1,185 @@ +From 5f61d249507c3502c3c76faf3926522e6e63370d Mon Sep 17 00:00:00 2001 +From: Devan Franchini +Date: Fri, 3 Jan 2014 21:03:00 -0500 +Subject: [PATCH] WebappConfig/{ebuild,content}.py: Nulls doctest code. + +Due to the variable nature of the returning values of the two functions +run_vars() and add(), it is unrealistic to depend on doctest to not +fail. It has been decided that disabling these two doctest codes would +be the best decision to prevent failures that are not detrimental. + +X-Gentoo-Bug: 430010 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010 +--- + WebappConfig/content.py | 36 ++++++++++++++++++------------------ + WebappConfig/ebuild.py | 46 +++++++++++++++++++++++----------------------- + 2 files changed, 41 insertions(+), 41 deletions(-) + +diff --git a/WebappConfig/content.py b/WebappConfig/content.py +index 8fe5be9..c635f5a 100644 +--- a/WebappConfig/content.py ++++ b/WebappConfig/content.py +@@ -379,71 +379,71 @@ class Contents: + (and this is important for md5) + relative - 1 for storing a relative filename, 0 otherwise + +- >>> OUT.color_off() +- >>> import os.path +- >>> here = os.path.dirname(os.path.realpath(__file__)) ++ OUT.color_off() ++ import os.path ++ here = os.path.dirname(os.path.realpath(__file__)) + + One for pretending: + +- >>> a = Contents(here + '/tests/testfiles/contents/app/', ++ a = Contents(here + '/tests/testfiles/contents/app/', + ... package = 'test', version = '1.0', + ... pretend = True) + + And this one is for real: + +- >>> b = Contents(here + '/tests/testfiles/contents/app/', ++ b = Contents(here + '/tests/testfiles/contents/app/', + ... package = 'test', version = '1.0') + + Pretend to add a file: + +- >>> a.add('file', 'config-owned', ++ a.add('file', 'config-owned', + ... destination = here + '/tests/testfiles/contents/app/', + ... path = '/test1', relative = True) + * pretending to add: file 1 config-owned "test1" + + Lets not pretend this time: + +- >>> b.add('file', 'config-owned', ++ b.add('file', 'config-owned', + ... destination = here + '/tests/testfiles/contents/app/', + ... path = '/test1', relative = True) +- >>> b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS ++ b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS + 'file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249 ' + + Lets produce an error with a file that does not exist: + +- >>> b.add('file', 'config-owned', ++ b.add('file', 'config-owned', + ... destination = here + '/tests/testfiles/contents/app/', + ... path = '/nothere', relative = True) #doctest: +ELLIPSIS + * Cannot access file .../tests/testfiles/contents/app/nothere to add it as installation content. This should not happen! + + Other file types: + +- >>> b.add('hardlink', 'config-owned', ++ b.add('hardlink', 'config-owned', + ... destination = here + '/tests/testfiles/contents/app/', + ... path = '/test2', relative = True) +- >>> b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS ++ b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS + 'file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249 ' +- >>> b.add('dir', 'default-owned', ++ b.add('dir', 'default-owned', + ... destination = here + '/tests/testfiles/contents/app/', + ... path = '/dir1', relative = True) +- >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS ++ b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS + 'dir 1 default-owned "dir1" ... 0 ' +- >>> b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app', ++ b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app', + ... path = '/dir1', + ... relative = False) +- >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS ++ b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS + 'dir 0 default-owned ".../tests/testfiles/contents/app/dir1" ... 0 ' + + Q: Is the full link to the target what we want? + A: Yes, since the link will still be ok even if we move the directory. + +- >>> b.add('sym', 'virtual', ++ b.add('sym', 'virtual', + ... destination = here + '/tests/testfiles/contents/app/', + ... path = '/test3', relative = True) +- >>> b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS ++ b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS + 'sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1' + +- >>> b.db_print() #doctest: +ELLIPSIS ++ b.db_print() #doctest: +ELLIPSIS + file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249 + file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249 + sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1 +diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py +index 03c0c57..cc23bec 100644 +--- a/WebappConfig/ebuild.py ++++ b/WebappConfig/ebuild.py +@@ -201,35 +201,35 @@ class Ebuild: + The procedure from above is repeated to set up the default + environment: + +- >>> import WebappConfig.config +- >>> config = WebappConfig.config.Config() +- >>> config.config.set('USER', 'my_htdocsbase', 'htdocs') +- >>> config.config.set('USER', 'pn', 'horde') +- >>> config.config.set('USER', 'pvr', '3.0.5') +- >>> import os.path +- >>> here = os.path.dirname(os.path.realpath(__file__)) +- >>> config.config.set('USER', 'my_approot', here + +- ... '/tests/testfiles/share-webapps') +- >>> my_approot = config.config.get('USER', 'my_approot') +- >>> my_appdir = my_approot + "/horde/3.0.5" +- >>> config.config.set('USER', 'my_appdir', my_appdir) +- >>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks') +- >>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin') +- >>> config.config.set('USER', 'my_errorsbase', 'error') +- >>> config.config.set('USER', 'my_iconsbase', 'icons') +- >>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf'])) +- >>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot'])) +- >>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs'])) +- >>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts'])) ++ "">>> import WebappConfig.config" ++ ">>> config = WebappConfig.config.Config()" ++ ">>> config.config.set('USER', 'my_htdocsbase', 'htdocs')" ++ ">>> config.config.set('USER', 'pn', 'horde')" ++ ">>> config.config.set('USER', 'pvr', '3.0.5')" ++ ">>> import os.path" ++ ">>> here = os.path.dirname(os.path.realpath(__file__))" ++ ">>> config.config.set('USER', 'my_approot', here +" ++ "... '/tests/testfiles/share-webapps')" ++ ">>> my_approot = config.config.get('USER', 'my_approot')" ++ ">>> my_appdir = my_approot + "/horde/3.0.5"" ++ ">>> config.config.set('USER', 'my_appdir', my_appdir)" ++ ">>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')" ++ ">>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')" ++ ">>> config.config.set('USER', 'my_errorsbase', 'error')" ++ ">>> config.config.set('USER', 'my_iconsbase', 'icons')" ++ ">>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))" ++ ">>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))" ++ ">>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))" ++ ">>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))" + + Time to create the ebuild handler: + +- >>> a = Ebuild(config) ++ ">>> a = Ebuild(config)" + + The dummy post-install file should display all the variables + that are exported here: + +- >>> a.show_postinst() #doctest: +ELLIPSIS ++ ">>> a.show_postinst() #doctest: +ELLIPSIS + + ================================================================= + POST-INSTALL INSTRUCTIONS +@@ -270,7 +270,7 @@ class Ebuild: + PVR: 3.0.5 + + ================================================================= +- ++ " + ''' + + v_root = self.get_config('vhost_root') +-- +1.8.3.2 + diff --git a/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch new file mode 100644 index 000000000000..06a924a426be --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch @@ -0,0 +1,25 @@ +From ff7ba0d89c79584f14a8137d886a656a9af6de5c Mon Sep 17 00:00:00 2001 +From: Devan Franchini +Date: Sat, 27 Dec 2014 20:43:08 -0500 +Subject: [PATCH] webapp-cleaner: sources function.sh from /lib/gentoo + +--- + sbin/webapp-cleaner | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner +index bfec623..52e44ac 100755 +--- a/sbin/webapp-cleaner ++++ b/sbin/webapp-cleaner +@@ -13,7 +13,7 @@ CMD="emerge -Cav" + WEBAPP_DIR="/usr/share/webapps" + WEBAPP_CONFIG= + +-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh ++[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh + + function help() { + echo "Remove obsolete and unused versions of web applications" +-- +2.0.5 + diff --git a/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch new file mode 100644 index 000000000000..9958c142d4a7 --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch @@ -0,0 +1,12 @@ +diff -Naur WebappConfig.old/ebuild.py WebappConfig/ebuild.py +--- WebappConfig/ebuild.py ++++ WebappConfig/ebuild.py +@@ -101,7 +101,7 @@ + + for i in post_instructions: + i = i.replace('"', '\\"') +- post.append(os.popen('echo -n "' + i + '"\n').read()[:-1]) ++ post.append(os.popen('printf "' + i + '"\n').read()[:-1]) + + post = post + [ + '', diff --git a/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch new file mode 100644 index 000000000000..9a35ad70cafb --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch @@ -0,0 +1,49 @@ +commit 9e251c7574d074e424ea19024f743c754f321979 +Author: Devan Franchini +Date: Fri Jul 10 21:25:17 2015 -0400 + + config.py: Fixes package version checking regression + + Previously webapp-config would not do any sanity checks when + setting the package version. After adding a sanity check in 1.54 + I made the mistake of not being flexible enough and this caused + a regression that prevented web apps with versions such as + "20140929d"[1] to be installed. This commit fixes that while still + allowing for some sanity checking. + + [1]: https://github.com/gentoo/webapp-config/issues/2 + +diff --git a/WebappConfig/config.py b/WebappConfig/config.py +index 6c915c3..3a176a0 100644 +--- a/WebappConfig/config.py ++++ b/WebappConfig/config.py +@@ -996,17 +996,20 @@ class Config: + OUT.die('Invalid package name') + + if len(args) > 1: +- argsvr = args[1].split('.') +- if len(argsvr) == 1: +- OUT.die('Invalid package version: %(pvr)s' ++ pvr = args[1] ++ has_int = False # A package version should have at least one ++ # numerical value, but we want to allow for ++ # the flexibility of having any alphanumeric ++ # value while checking to make sure it's sane. ++ ++ for char in pvr: ++ if char.isdigit(): ++ has_int = True ++ ++ if not has_int: ++ OUT.die('Invalid package version: "%(pvr)s"' + % {'pvr': args[1]}) + +- pvr = '' +- for i in range(0, len(argsvr)): +- if not i == len(argsvr) - 1: +- pvr += argsvr[i] + '.' +- else: +- pvr += argsvr[i] + self.config.set('USER', 'pvr', pvr) + + if (not options['dir'] and diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml new file mode 100644 index 000000000000..bf2371089c83 --- /dev/null +++ b/app-admin/webapp-config/metadata.xml @@ -0,0 +1,22 @@ + + + + + twitch153@gentoo.org + Devan Franchini + + + blueness@gentoo.org + Anthony G. Basile + + + web-apps@gentoo.org + Gentoo Webapps + + + Propagete python_targets dependencies to sys-apps/portage + + + webapp-config + + diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild new file mode 100644 index 000000000000..e8c416dd5e3a --- /dev/null +++ b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2" +KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" + +DESCRIPTION="Gentoo's installer for web-based applications" +HOMEPAGE="https://sourceforge.net/projects/webapp-config/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+portage" + +DEPEND="app-text/xmlto + !dev-python/configparser" +RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +python_prepare() { + epatch "${FILESDIR}/${P}-nulls-doctest.patch" +} + +python_compile_all() { + emake -C doc/ +} + +python_install() { + # According to this discussion: + # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html + # distutils does not provide for specifying two different script install + # locations. Since we only install one script here the following should + # be ok + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] + dohtml doc/*.[58].html +} + +python_test() { + PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \ + || die "Testing failed with ${EPYTHON}" +} + +pkg_postinst() { + elog "Now that you have upgraded webapp-config, you **must** update your" + elog "config files in /etc/vhosts/webapp-config before you emerge any" + elog "packages that use webapp-config." +} diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild new file mode 100644 index 000000000000..e7084845cb46 --- /dev/null +++ b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +RESTRICT="test" + +PYTHON_COMPAT=( python{2_7,3_4} pypy ) + +inherit distutils-r1 + +SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" + +DESCRIPTION="Gentoo's installer for web-based applications" +HOMEPAGE="https://sourceforge.net/projects/webapp-config/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+portage" + +DEPEND="app-text/xmlto + !dev-python/configparser + sys-apps/gentoo-functions" +RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +python_prepare() { + epatch "${FILESDIR}/${P}-sources-function.sh-from-lib-gentoo.patch" +} + +python_compile_all() { + emake -C doc/ +} + +python_install() { + # According to this discussion: + # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html + # distutils does not provide for specifying two different script install + # locations. Since we only install one script here the following should + # be ok + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] + dohtml doc/*.[58].html +} + +python_test() { + PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \ + || die "Testing failed with ${EPYTHON}" +} + +pkg_postinst() { + elog "Now that you have upgraded webapp-config, you **must** update your" + elog "config files in /etc/vhosts/webapp-config before you emerge any" + elog "packages that use webapp-config." +} diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild new file mode 100644 index 000000000000..d364cbb45113 --- /dev/null +++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) + +inherit distutils-r1 + +SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +DESCRIPTION="Gentoo's installer for web-based applications" +HOMEPAGE="https://sourceforge.net/projects/webapp-config/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+portage" + +DEPEND="app-text/xmlto + sys-apps/gentoo-functions" +RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +python_prepare() { + epatch "${FILESDIR}/${P}-pvr-check.patch"\ + "${FILESDIR}/${P}-fix-bashism.patch" +} +python_compile_all() { + emake -C doc/ +} + +python_install() { + # According to this discussion: + # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html + # distutils does not provide for specifying two different script install + # locations. Since we only install one script here the following should + # be ok + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] + dohtml doc/*.[58].html +} + +python_test() { + PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \ + || die "Testing failed with ${EPYTHON}" +} + +pkg_postinst() { + elog "webapp-config now requires that all -I/-U/-C commands be followed" + elog "by the package name and package version of the webapp" + elog "eg.) 'webapp-config -d drupal -I drupal 8.0.0_beta10'" + elog "See 'man 8 webapp-config' for more information" +} diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55.ebuild new file mode 100644 index 000000000000..b83d9fcd994a --- /dev/null +++ b/app-admin/webapp-config/webapp-config-1.55.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) + +inherit distutils-r1 prefix + +SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" + +DESCRIPTION="Gentoo's installer for web-based applications" +HOMEPAGE="https://sourceforge.net/projects/webapp-config/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+portage" + +DEPEND="app-text/xmlto + sys-apps/gentoo-functions" +RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +python_prepare_all() { + distutils-r1_python_prepare_all + eprefixify WebappConfig/eprefix.py config/webapp-config +} + +python_compile_all() { + emake -C doc/ +} + +python_install() { + # According to this discussion: + # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html + # distutils does not provide for specifying two different script install + # locations. Since we only install one script here the following should + # be ok + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] + dohtml doc/*.[58].html +} + +python_test() { + PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \ + || die "Testing failed with ${EPYTHON}" +} + +pkg_postinst() { + elog "Now that you have upgraded webapp-config, you **must** update your" + elog "config files in /etc/vhosts/webapp-config before you emerge any" + elog "packages that use webapp-config." +} diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild new file mode 100644 index 000000000000..409c9b0d9b1b --- /dev/null +++ b/app-admin/webapp-config/webapp-config-9999.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) + +inherit distutils-r1 prefix + +if [[ ${PV} = 9999* ]] +then + EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +fi + +DESCRIPTION="Gentoo's installer for web-based applications" +HOMEPAGE="https://sourceforge.net/projects/webapp-config/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+portage" + +DEPEND="app-text/xmlto + sys-apps/gentoo-functions" +RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +python_prepare_all() { + distutils-r1_python_prepare_all + eprefixify WebappConfig/eprefix.py config/webapp-config +} + +python_compile_all() { + emake -C doc/ +} + +python_install() { + # According to this discussion: + # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html + # distutils does not provide for specifying two different script install + # locations. Since we only install one script here the following should + # be ok + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] + dohtml doc/*.[58].html +} + +python_test() { + PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \ + || die "Testing failed with ${EPYTHON}" +} + +pkg_postinst() { + elog "Now that you have upgraded webapp-config, you **must** update your" + elog "config files in /etc/vhosts/webapp-config before you emerge any" + elog "packages that use webapp-config." +} -- cgit v1.2.3