Revert "server+sambaDC: temporarily rollback libtalloc"

This reverts commit df6bdad338: https://bugzilla.altlinux.org/31881 has been worked around today.
server+sambaDC: temporarily rollback libtalloc
2016-03-14 15:06:04 +03:00 · 2016-03-12 21:10:26 +03:00 · 2016-03-12 12:24:52 +03:00 · 2016-03-12 02:50:31 +03:00 · 2016-03-12 02:44:49 +03:00 · 2016-03-12 02:43:45 +03:00
8 changed files with 22 additions and 20 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@ -1,6 +1,6 @@
 Name: mkimage-profiles
-Version: 1.1.86
-Release: alt1
+Version: 1.1.87
+Release: alt0.M70P.1

 Summary: ALT Linux based distribution metaprofile
 License: GPLv2+
@ -90,6 +90,9 @@ mv %buildroot%mpdir/doc/mkimage-profiles.7 %buildroot%_man7dir/
 %endif

 %changelog
+* Sat Mar 12 2016 Michael Shigorin <mike@altlinux.org> 1.1.87-alt0.M70P.1
+- starterkits-20160312
+
 * Mon Feb 29 2016 Michael Shigorin <mike@altlinux.org> 1.1.86-alt1
 - junior

--- a/conf.d/p7.mk
+++ b/conf.d/p7.mk
@ -28,6 +28,7 @@ distro/altlinux-p7-xfce-sysv: distro/regular-xfce-sysv mixin/p7; @:
 distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @:

 distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @:
+distro/altlinux-p7-jeos-ovz: distro/regular-jeos-ovz mixin/p7; @:
 distro/altlinux-p7-server: distro/regular-server mixin/p7; @:
 distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @:
 distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @:
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@ -157,7 +157,6 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,LIVE_PACKAGES_REGEXP,^setup-gnome3-done.*)
 	@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
-	@$(call add,LIVE_PACKAGES,gnome-flashback)

 # reusable bits
 mixin/regular-tde: +tde \
@ -180,7 +179,7 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)

-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
+mixin/regular-lxqt: use/x11/lxqt use/x11/lightdm/lxqt \
 	use/net/connman use/browser/qupzilla +plymouth
 	@$(call add,THE_PACKAGES,qconnman-ui)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
--- a/features.in/browser/config.mk
+++ b/features.in/browser/config.mk
@ -50,4 +50,4 @@ use/browser/plugin/flash: use/browser
 	@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)

 use/browser/plugin/java: use/browser
-	@$(call add,THE_PACKAGES,mozilla-plugin-java-1.8.0-openjdk)
+	@$(call add,THE_PACKAGES,mozilla-plugin-java-1.7.0-openjdk)
--- a/pkg.in/lists/slinux/network
+++ b/pkg.in/lists/slinux/network
@ -1,6 +1,6 @@
 mozilla-plugin-adobe-flash
 firefox-yandexbar
-mozilla-plugin-java-1.8.0-openjdk
+mozilla-plugin-java-1.7.0-openjdk
 thunderbird
 thunderbird-ru

--- a/pkg.in/lists/tagged/base+smartcard
+++ b/pkg.in/lists/tagged/base+smartcard
@ -9,4 +9,3 @@ pcsc-lite-openct
 pcsc-lite-rutokens

 pam_pkcs11
-pam_p11
--- a/pkg.in/lists/tagged/desktop+gnustep
+++ b/pkg.in/lists/tagged/desktop+gnustep
@ -30,8 +30,8 @@ gnustep-Camera
 gnustep-CameraTransfer
 gnustep-Cartotheque
 gnustep-CDPlayer
-#gnustep-cenon
-#gnustep-Chess
+gnustep-cenon
+gnustep-Chess
 #gnustep-Connect
 gnustep-Cynthiune
 gnustep-DataBasin
@ -48,7 +48,7 @@ gnustep-Gemas
 gnustep-Ghack
 gnustep-gmastermind
 gnustep-gmines
-#gnustep-GNUMail
+gnustep-GNUMail
 gnustep-GNUWash
 gnustep-Gomoku
 gnustep-gorm
@ -56,7 +56,7 @@ gnustep-Graphos
 gnustep-Grouch
 gnustep-Grr
 gnustep-GRubik
-#gnustep-GSBench
+gnustep-GSBench
 gnustep-GScheme
 gnustep-GSCommander
 #gnustep-GSDock # i586-only, abandoned
@ -77,13 +77,13 @@ gnustep-LapisPuzzle
 gnustep-LaternaMagica
 gnustep-Localize
 #gnustep-LoginPanel
-#gnustep-LuserNET
+gnustep-LuserNET
 gnustep-Lynkeos
 #gnustep-Mixer
 gnustep-Money
 gnustep-MPDCon
 gnustep-MusicBox
-#gnustep-MusicKit
+gnustep-MusicKit
 gnustep-MyWiki
 #gnustep-NeXTGo
 gnustep-NoteBook
@ -95,13 +95,13 @@ gnustep-Poe
 gnustep-Popup
 gnustep-Preview
 gnustep-PRICE
-#gnustep-projectcenter
+gnustep-projectcenter
 gnustep-ProjectManager
 gnustep-quartzcore
 gnustep-RemoteDesk
 #gnustep-renaissance
 gnustep-SequenceConverter
-#gnustep-SimpleAgenda
+gnustep-SimpleAgenda
 gnustep-SlideShow
 gnustep-Stepbill
 gnustep-Stepulator
@ -110,7 +110,7 @@ gnustep-systempreferences
 gnustep-TalkSoup
 gnustep-terminal
 gnustep-TextEdit
-#gnustep-thematic
+gnustep-thematic
 gnustep-Ticker
 gnustep-TimeMon
 gnustep-Toolbox
--- a/pkg.in/lists/tagged/desktop+gnustep+etoile
+++ b/pkg.in/lists/tagged/desktop+gnustep+etoile
@ -6,15 +6,15 @@
 gnustep-Etoile-DictionaryReader
 gnustep-Etoile-FontManager
 #gnustep-Etoile-Inbox
-#gnustep-Etoile-LDAPAddressBook
+gnustep-Etoile-LDAPAddressBook
 #gnustep-Etoile-MenuServer
 #gnustep-Etoile-ModelBuilder
 #gnustep-Etoile-ObjectManager
 #gnustep-Etoile-Sandbox
 #gnustep-Etoile-ScriptServices
 #gnustep-Etoile-StepChat
-#gnustep-Etoile-System
-#gnustep-Etoile-Typewriter
+gnustep-Etoile-System
+gnustep-Etoile-Typewriter
 #gnustep-Etoile-VCFInspector
-#gnustep-Etoile-Vindaloo
+gnustep-Etoile-Vindaloo
 #gnustep-Etoile-Worktable
Author	SHA1	Message	Date
Michael Shigorin	0145c3d37f	Revert "server+sambaDC: temporarily rollback libtalloc" This reverts commit `df6bdad338`: https://bugzilla.altlinux.org/31881 has been worked around today.	2016-03-14 15:06:04 +03:00
Michael Shigorin	df6bdad338	server+sambaDC: temporarily rollback libtalloc This should be reverted ASAP but as of today #31881 holds: - samba-DC 4.3.6 + libtalloc 2.1.6 break `samba-tool domain provision'; - samba-DC 4.3.6 + libtalloc 2.1.5 won't build [1]; - samba-DC 4.3.5 + libtalloc 2.1.5 work (but have known vulnerabilities). [1] using p7 archive packages, rebuilding 4.3.6 with 2.1.5 should help	2016-03-12 21:10:26 +03:00
Michael Shigorin	a525c32a62	p7.mk: add jeos-ovz The forgotten commit: it's not the "official" target but one of the worthy "beta" ones, let's still do it.	2016-03-12 12:24:52 +03:00
Michael Shigorin	23c3673bb1	1.1.87-alt0.M70P.1 - starterkits-20160312	2016-03-12 02:50:31 +03:00
Michael Shigorin	f9165487ca	Revert "browser, slinux/network: upgrade java browser plugin" This reverts commit `c2fb322228`: no OpenJDK 8 in p7/t7, on the other hand.	2016-03-12 02:44:49 +03:00
Michael Shigorin	129e6e580c	Revert "desktop+gnustep: gnustep-MusicKit is no more in sisyphus" This reverts commit `b190779ef5`: still present in p7/t7.	2016-03-12 02:43:45 +03:00
Michael Shigorin	3ab613cf1e	Revert "desktop+gnustep: dropped FTBFS packages" This reverts commit `ee590934b4`: these packages are fine in p7/t7 too.	2016-03-12 02:43:24 +03:00
Michael Shigorin	fbb9acff80	Revert "desktop+gnustep{,+etoile}: dropped FTBFS packages" This reverts commit `83c2df00a9`: these packages are fine in p7/t7.	2016-03-12 02:43:16 +03:00
Michael Shigorin	71a16f9aa1	Revert "base+smartcard: added pam_p11" This reverts commit `16aa4dbcef`: there's no pam_p11 in p7/t7 and there's not much reason to backport it so far.	2016-03-12 02:42:42 +03:00
Michael Shigorin	03f1b226d8	Revert "regular.mk: added flashback session to gnome3" This reverts commit `35dd7ece35`: there's no gnome-flashback in p7/t7 and it's unlikely to come.	2016-03-12 02:42:10 +03:00
Michael Shigorin	a675ea3454	Revert "regular.mk: move lxqt to sddm" This reverts commit `fd1044d540`: there's no sddm in p7/t7 and there likely will be none.	2016-03-12 02:42:09 +03:00