[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#988054: unblock: python-xstatic-angular/1.5.8.0-5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package python-xstatic-angular

[ A bit of background about xstatic packages ]
XStatic packages are a way to embedd artifacts in a Python module. In
Debian, they are patched to use the matching libjs-FOO, instead of the
version embedded in the package.

python-xstatic-angular/1.5.8.0-4 used to have a dependency on
libjs-angularjs, and use that instead of the embedded version.
Version 1.5.8.0-5 removes the patch, so that Horizon (the OpenStack
dashboard) can continue to use Angular 1.5.x, as version 1.8.x,
currently in Bullseye, renders (at least) the ssh keypair and the
Glance image panel completely broken (ie: nothing is displayed there).

[ Reason ]
Fix the Horizon ssh keypair and the Glance image panel.

[ Impact ]
No impact for our users, except a working OpenStack dashboard.
It does have a security impact though, as we'll have to maintain
AngularJS 1.5.x for security.

[ Tests ]
Trying the new python3-xstatic-angular with the embedded JS code
does fix the problem, I tried in a deployment.

[ Risks ]
Security, as explained above in Impact.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
If this update is accepted, the trigger mechanism of Horizon will have
to be fixed to trigger on changes in the new path (ie:
/usr/lib/python3/dist-packages/xstatic/pkg/angular/data instead of
/usr/share/javascript/angular.js), so that it rebuilds its static
content in /var/lib/openstack-dashboard/static on a change triggered
by an update of python-xstatic-angular.

unblock python-xstatic-angular/1.5.8.0-5

Cheers,

Thomas Goirand (zigo)
diff -Nru python-xstatic-angular-1.5.8.0/debian/changelog python-xstatic-angular-1.5.8.0/debian/changelog
--- python-xstatic-angular-1.5.8.0/debian/changelog	2021-01-09 21:31:01.000000000 +0100
+++ python-xstatic-angular-1.5.8.0/debian/changelog	2021-05-04 09:00:08.000000000 +0200
@@ -1,3 +1,9 @@
+python-xstatic-angular (1.5.8.0-5) unstable; urgency=medium
+
+  * Remove debianize.patch and use provided AngularJS 1.5.8.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 04 May 2021 09:00:08 +0200
+
 python-xstatic-angular (1.5.8.0-4) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru python-xstatic-angular-1.5.8.0/debian/control python-xstatic-angular-1.5.8.0/debian/control
--- python-xstatic-angular-1.5.8.0/debian/control	2021-01-09 21:31:01.000000000 +0100
+++ python-xstatic-angular-1.5.8.0/debian/control	2021-05-04 09:00:08.000000000 +0200
@@ -18,7 +18,6 @@
 Package: python3-xstatic-angular
 Architecture: all
 Depends:
- libjs-angularjs (>= 1.5.8),
  python3-xstatic,
  ${misc:Depends},
  ${python3:Depends},
diff -Nru python-xstatic-angular-1.5.8.0/debian/patches/debianize.patch python-xstatic-angular-1.5.8.0/debian/patches/debianize.patch
--- python-xstatic-angular-1.5.8.0/debian/patches/debianize.patch	2021-01-09 21:31:01.000000000 +0100
+++ python-xstatic-angular-1.5.8.0/debian/patches/debianize.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-Description: Debianize
- Using the system's version of angular.js
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: not-needed
-Last-Update: 2015-07-28
-
-Index: python-xstatic-angular/xstatic/pkg/angular/__init__.py
-===================================================================
---- python-xstatic-angular.orig/xstatic/pkg/angular/__init__.py
-+++ python-xstatic-angular/xstatic/pkg/angular/__init__.py
-@@ -34,9 +34,9 @@ HOMEPAGE = 'http://angularjs.org'
- LICENSE = 'MIT'
- 
- from os.path import join, dirname
--BASE_DIR = join(dirname(__file__), 'data')
-+#BASE_DIR = join(dirname(__file__), 'data')
- # linux package maintainers just can point to their file locations like this:
--#BASE_DIR = '/usr/share/javascript/angular'
-+BASE_DIR = '/usr/share/javascript/angular.js'
- 
- LOCATIONS = {
-     # CDN locations (if no public CDN exists, use an empty dict)
diff -Nru python-xstatic-angular-1.5.8.0/debian/patches/series python-xstatic-angular-1.5.8.0/debian/patches/series
--- python-xstatic-angular-1.5.8.0/debian/patches/series	2021-01-09 21:31:01.000000000 +0100
+++ python-xstatic-angular-1.5.8.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debianize.patch
diff -Nru python-xstatic-angular-1.5.8.0/debian/rules python-xstatic-angular-1.5.8.0/debian/rules
--- python-xstatic-angular-1.5.8.0/debian/rules	2021-01-09 21:31:01.000000000 +0100
+++ python-xstatic-angular-1.5.8.0/debian/rules	2021-05-04 09:00:08.000000000 +0200
@@ -14,7 +14,6 @@
 
 override_dh_auto_install:
 	pkgos-dh_auto_install --no-py2
-	rm -rf $(CURDIR)/debian/python3-xstatic*/usr/lib/python3/dist-packages/xstatic/pkg/*/data
 
 override_dh_clean:
 	dh_clean -O--buildsystem=python_distutils

Reply to: