Browse code

update lightwave to 1.3.1

Change-Id: Ibe5df62368c783efd45c6b978550076569be98f5
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3496
Reviewed-by: Sharath George
Tested-by: Sharath George

Priyesh Padmavilasom authored on 2017/08/11 16:46:39
Showing 2 changed files
... ...
@@ -1,13 +1,13 @@
1 1
 Name:          lightwave
2 2
 Summary:       VMware Lightwave
3
-Version:       1.2.1
4
-Release:       5%{?dist}
3
+Version:       1.3.1
4
+Release:       1%{?dist}
5 5
 License:       Apache 2.0
6 6
 Group:         Applications/System
7 7
 Vendor:        VMware, Inc.
8 8
 URL: 	       https://github.com/vmware/lightwave
9 9
 Source0:       lightwave-%{version}.tar.gz
10
-%define sha1 lightwave=8eca0b7e215a3cf1c94e1d903e06f6f274b525e5
10
+%define sha1 lightwave=e8cc3582ffe0586b9b21ef87d9abe4160854e9c4
11 11
 Distribution:  Photon
12 12
 
13 13
 Requires:  apache-tomcat >= 8.5.8
... ...
@@ -18,7 +18,7 @@ Requires:  cyrus-sasl >= 2.1
18 18
 Requires:  e2fsprogs
19 19
 Requires:  gawk >= 4.1.3
20 20
 Requires:  krb5 >= 1.14
21
-Requires:  likewise-open >= 6.2.10
21
+Requires:  likewise-open >= 6.2.11.4
22 22
 Requires:  openjre8 >= %{JAVA8_VERSION}
23 23
 Requires:  openssl >= 1.0.2
24 24
 Requires:  lightwave-client = %{version}
... ...
@@ -59,25 +59,27 @@ VMware Lightwave Server
59 59
 
60 60
 %define _likewise_open_bindir %{_likewise_open_prefix}/bin
61 61
 %define _likewise_open_sbindir %{_likewise_open_prefix}/sbin
62
+%define _lwisbindir %{_likewise_open_bindir}
62 63
 
63 64
 %if 0%{?_javahome:1} == 0
64 65
 %define _javahome %{_java_home}
65 66
 %endif
66 67
 
67
-%define _sasl2dir /usr/lib/sasl2
68
-%define _krb5_lib_dir /usr/lib
68
+%define _sasl2dir %{_libdir}/sasl2
69
+%define _krb5_lib_dir %{_libdir}
69 70
 %define _krb5_gss_conf_dir /etc/gss
70 71
 %define _logdir /var/log/lightwave
71 72
 %define _logconfdir /etc/syslog-ng/lightwave.conf.d
72 73
 %define _pymodulesdir /opt/vmware/site-packages/identity
73
-%define _jreextdir %{_javahome}/jre/lib/ext
74
+%define _jreextdir /etc/alternatives/jre/lib/ext
74 75
 
75
-%define _lw_dbdir     %{_localstatedir}/lib/vmware
76
-%define _lwraft_dbdir %{_lw_dbdir}/lwraft
77
-%define _vmca_dbdir   %{_lw_dbdir}/vmca
78
-%define _vmdir_dbdir  %{_lw_dbdir}/vmdir
79
-%define _vmafd_dbdir  %{_lw_dbdir}/vmafd
80
-%define _vmsts_dbdir  %{_lw_dbdir}/vmsts
76
+%define _lightwavedbdir /var/lib/vmware
77
+
78
+%define _post_dbdir   %{_lightwavedbdir}/post
79
+%define _vmca_dbdir   %{_lightwavedbdir}/vmca
80
+%define _vmdir_dbdir  %{_lightwavedbdir}/vmdir
81
+%define _vmafd_dbdir  %{_lightwavedbdir}/vmafd
82
+%define _vmsts_dbdir  %{_lightwavedbdir}/vmsts
81 83
 
82 84
 %define _vecsdir %{_vmafd_dbdir}/vecs
83 85
 %define _crlsdir %{_vmafd_dbdir}/crl
... ...
@@ -112,73 +114,29 @@ Requires: lightwave-client = %{version}
112 112
 %description devel
113 113
 Development Libraries to communicate with Lightwave Services
114 114
 
115
-%package raft
116
-Summary: Lightwave Raft Service
117
-Requires: lightwave-client = %{version}
118
-
119
-%description raft
120
-Lightwave Raft Service
115
+%package post
116
+Summary: Lightwave POST Service
117
+Requires: lightwave-client = %{_version}
118
+%description post
119
+Lightwave POST service
121 120
 
122 121
 %prep
123 122
 %setup -qn lightwave-%{version}
124
-sed -i 's/^VMWARE_DIR=.*/VMWARE_DIR=\%{_prefix}/' config/scripts/configure-lightwave-server.in
125
-sed -i 's/^VMWARE_DIR=.*/VMWARE_DIR=\%{_prefix}/' config/scripts/configure-identity-server.in
126
-sed -i 's/\/opt\/vmware/\%{_prefix}/' config/scripts/firewall.service
127
-sed -i 's/getCertoolPath() + "/"certool /' vmidentity/install/src/main/java/com/vmware/identity/configure/LinuxInstallerHelper.java
128
-sed -i 's/^PREFIX=.*/PREFIX=\%{_prefix}/' vmidentity/config/vmware-stsd.sh.in
129
-sed -i 's/^TC_INSTANCE_ROOT=.*/TC_INSTANCE_ROOT=\%{_prefix}/' vmidentity/install/src/main/resources/configure-sts.sh
130
-sed -i 's/\/opt\/vmware/\%{_prefix}/' vmidentity/config/vmware-stsd.service.in
131
-sed -i 's/rpm -qa vmware-sts/rpm -qa lightwave/' vmidentity/install/src/main/java/com/vmware/identity/installer/ReleaseUtil.java
132
-sed -i 's/VMIDENTITY_LIB_DIR=\/opt\/vmware\/jars/VMIDENTITY_LIB_DIR=\/usr\/jars/' vmidentity/websso/src/main/resources/sso-config.sh
123
+sed -i 's|/opt/vmware/bin/certool|/usr/bin/certool|' vmidentity/install/src/main/java/com/vmware/identity/configure/LinuxInstallerHelper.java
124
+sed -i 's/VMIDENTITY_LIB_DIR=\/opt\/vmware\/lib64/VMIDENTITY_LIB_DIR=\/usr\/jars/' vmidentity/websso/src/main/resources/sso-config.sh
133 125
 sed -i 's,/opt/vmware/bin/ic-join,/usr/bin/ic-join,' config/scripts/domainjoin.sh
134
-sed -i 's#$COMMONS_DAEMON_HOME#usr#g' vmidentity/configure.ac
126
+sed -i 's#$COMMONS_DAEMON_HOME#usr#g' configure.ac
135 127
 %build
136 128
 
137
-export CFLAGS="-Wno-pointer-sign -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-address -Wno-deprecated-declarations -Wno-enum-compare"
138 129
 cd build
139
-STAGEDIR=$PWD/stage
140 130
 autoreconf -mif .. &&
141 131
 ../configure \
132
+    CFLAGS="-Wall -Werror -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-implicit-function-declaration -Wno-address -Wno-enum-compare" \
142 133
     LDFLAGS=-ldl \
143
-    STAGEDIR=$STAGEDIR \
144 134
     --prefix=%{_prefix} \
145 135
     --libdir=%{_lib64dir} \
146
-    --localstatedir=/var/lib/vmware \
147
-    --with-vmevent=$STAGEDIR%{_prefix} \
148
-    --with-vmdir=$STAGEDIR%{_prefix} \
149
-    --with-vmdns=$STAGEDIR%{_prefix} \
150
-    --with-afd=$STAGEDIR%{_prefix} \
151
-    --with-vmca=$STAGEDIR%{_prefix} \
152
-    --with-sts=$STAGEDIR%{_prefix} \
153
-    --with-likewise=%{_likewise_open_prefix} \
154
-    --with-logdir=/var/log/lightwave \
155
-    --with-ssl=/usr \
156
-    --with-sqlite=/usr \
157
-    --with-python=/usr \
158
-    --with-java=%{_java_home} \
159
-    --with-ant=%{_ant_home} \
160
-    --with-commons-daemon=%{_commons_daemon_home} \
161
-    --with-maven=%{_maven_home} \
162
-    --with-tomcat=%{_tomcat_home} \
163
-    --with-boost=/usr \
164
-    --with-sasl=/usr \
165
-    --with-config=./config \
166
-    --with-datastore=mdb \
167
-    --enable-server \
168
-    --enable-krb5-default \
169
-    --enable-lightwave-build \
170
-    --disable-static \
171
-    ac_cv_header_vmevent=yes \
172
-    ac_cv_header_vmdirclient_h=yes \
173
-    ac_cv_lib_vmdirclient_VmDirSetupHostInstance=yes \
174
-    ac_cv_lib_vmdirclient_VmDirConnectionOpen=yes \
175
-    ac_cv_header_vmdns_h=yes \
176
-    ac_cv_lib_vmdnsclient_VmDnsOpenServerA=yes \
177
-    ac_cv_header_vmafdclient_h=yes \
178
-    ac_cv_lib_vmafdclient_VmAfdGetDomainNameA=yes \
179
-    ac_cv_header_vmca_h=yes \
180
-    ac_cv_lib_vmcaclient_VMCACreateSelfSignedCertificateA=yes
181
-    make
136
+    --localstatedir=%{_localstatedir}
137
+make
182 138
 
183 139
 %install
184 140
 
... ...
@@ -247,7 +205,7 @@ find %{buildroot} -name '*.la' -delete
247 247
             ;;
248 248
     esac
249 249
 
250
-%pre raft
250
+%pre post
251 251
 
252 252
     # First argument is 1 => New Installation
253 253
     # First argument is 2 => Upgrade
... ...
@@ -282,9 +240,10 @@ find %{buildroot} -name '*.la' -delete
282 282
 if [ $1 -eq 1 ]; then
283 283
   mkdir -p /opt/vmware
284 284
   ln -sf %{_lib64dir} /opt/vmware/
285
+  ln -sf %{_sbindir} /opt/vmware/
286
+  ln -sf %{_jarsdir} /opt/vmware/
285 287
   ln -sf %{_prefix}/vmware-sts /opt/vmware/
286 288
 fi
287
-    
288 289
 
289 290
 # config
290 291
 
... ...
@@ -350,7 +309,7 @@ fi
350 350
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdns.reg
351 351
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmca.reg
352 352
                 %{_likewise_open_bindir}/lwsm -q refresh
353
-                sleep 2
353
+                sleep 5
354 354
             else
355 355
                 started_lwregd=false
356 356
                 if [ -z "`pidof lwregd`" ]; then
... ...
@@ -402,7 +361,7 @@ fi
402 402
                 %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmdns.reg
403 403
                 %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmca.reg
404 404
                 %{_likewise_open_bindir}/lwsm -q refresh
405
-                sleep 2
405
+                sleep 5
406 406
             else
407 407
                 started_lwregd=false
408 408
                 if [ -z "`pidof lwregd`" ]; then
... ...
@@ -488,7 +447,7 @@ fi
488 488
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdir-client.reg
489 489
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdns-client.reg
490 490
                 %{_likewise_open_bindir}/lwsm -q refresh
491
-                sleep 2
491
+                sleep 5
492 492
             else
493 493
                 started_lwregd=false
494 494
                 if [ -z "`pidof lwregd`" ]; then
... ...
@@ -544,96 +503,6 @@ fi
544 544
             ;;
545 545
     esac
546 546
 
547
-%post raft
548
-
549
-    /bin/mkdir -m 700 -p %{_lwraft_dbdir}
550
-
551
-    if [ -a %{_sasl2dir}/lwraftd.conf ]; then
552
-        /bin/rm %{_sasl2dir}/lwraftd.conf
553
-    fi
554
-
555
-    # add lwraftd.conf to sasl2 directory
556
-    /bin/ln -s %{_datadir}/config/sasllwraftd.conf %{_sasl2dir}/lwraftd.conf
557
-
558
-    /bin/mkdir -m 755 -p %{_logdir}
559
-    /bin/mkdir -m 755 -p %{_logconfdir}
560
-    if [ -a %{_logconfdir}/lwraftd-syslog-ng.conf ]; then
561
-        /bin/rm %{_logconfdir}/lwraftd-syslog-ng.conf
562
-    fi
563
-    /bin/ln -s %{_datadir}/config/lwraftd-syslog-ng.conf %{_logconfdir}/lwraftd-syslog-ng.conf
564
-
565
-    case "$1" in
566
-        1)
567
-            #
568
-            # New Installation
569
-            #
570
-            try_starting_lwregd_svc=true
571
-
572
-            if [ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ]; then
573
-                try_starting_lwregd_svc=false
574
-            fi
575
-
576
-            /bin/systemctl >/dev/null 2>&1
577
-            if [ $? -ne 0 ]; then
578
-                try_starting_lwregd_svc=false
579
-            fi
580
-
581
-            if [ $try_starting_lwregd_svc = true ]; then
582
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/lwraft.reg
583
-                %{_likewise_open_bindir}/lwsm -q refresh
584
-                sleep 2
585
-            else
586
-                started_lwregd=false
587
-                if [ -z "`pidof lwregd`" ]; then
588
-                    echo "Starting lwregd"
589
-                    %{_likewise_open_sbindir}/lwregd &
590
-                    started_lwregd=true
591
-                    sleep 5
592
-                fi
593
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/lwraft.reg
594
-                if [ $started_lwregd = true ]; then
595
-                    kill -TERM `pidof lwregd`
596
-                    wait
597
-                fi
598
-            fi
599
-            ;;
600
-
601
-        2)
602
-            #
603
-            # Upgrade
604
-            #
605
-            try_starting_lwregd_svc=true
606
-
607
-            if [ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ]; then
608
-                try_starting_lwregd_svc=false
609
-            fi
610
-
611
-            /bin/systemctl >/dev/null 2>&1
612
-            if [ $? -ne 0 ]; then
613
-                try_starting_lwregd_svc=false
614
-            fi
615
-
616
-            if [ $try_starting_lwregd_svc = true ]; then
617
-                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/lwraft.reg
618
-                %{_likewise_open_bindir}/lwsm -q refresh
619
-                sleep 2
620
-            else
621
-                started_lwregd=false
622
-                if [ -z "`pidof lwregd`" ]; then
623
-                    echo "Starting lwregd"
624
-                    %{_likewise_open_sbindir}/lwregd &
625
-                    started_lwregd=true
626
-                    sleep 5
627
-                fi
628
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/lwraft.reg
629
-                if [ $started_lwregd = true ]; then
630
-                    kill -TERM `pidof lwregd`
631
-                    wait
632
-                fi
633
-            fi
634
-            ;;
635
-    esac
636
-
637 547
 %post client-libs
638 548
     # add libgssapi_srp.so to GSSAPI plugin directory
639 549
     if [ ! -h %{_krb5_lib_dir}/gss/libgssapi_srp.so ]; then
... ...
@@ -684,7 +553,7 @@ fi
684 684
                 %{_likewise_open_bindir}/lwregshell delete_tree 'HKEY_THIS_MACHINE\Services\vmca'
685 685
                 echo "Restarting service control manager..."
686 686
                 /bin/systemctl restart lwsmd
687
-                sleep 2
687
+                sleep 5
688 688
                 echo "Autostart services..."
689 689
                 %{_likewise_open_bindir}/lwsm autostart
690 690
             fi
... ...
@@ -745,7 +614,7 @@ fi
745 745
                 %{_likewise_open_bindir}/lwregshell delete_tree 'HKEY_THIS_MACHINE\Services\vmafd'
746 746
                 echo "Restarting service control manager..."
747 747
                 /bin/systemctl restart lwsmd
748
-                sleep 2
748
+                sleep 5
749 749
                 echo "Autostart services..."
750 750
                 %{_likewise_open_bindir}/lwsm autostart
751 751
             fi
... ...
@@ -763,32 +632,6 @@ fi
763 763
             ;;
764 764
     esac
765 765
 
766
-%preun raft
767
-
768
-    # First argument is 0 => Uninstall
769
-    # First argument is 1 => Upgrade
770
-
771
-    case "$1" in
772
-        0)
773
-            #
774
-            # Uninstall
775
-            #
776
-            %{_likewise_open_bindir}/lwsm info lwraft > /dev/null 2>&1
777
-            if [ $? -eq 0 ]; then
778
-                %{_likewise_open_bindir}/lwsm stop lwraft
779
-                %{_likewise_open_bindir}/lwregshell delete_tree 'HKEY_THIS_MACHINE\Services\lwraft'
780
-                /bin/systemctl restart lwsmd
781
-                %{_likewise_open_bindir}/lwsm autostart
782
-            fi
783
-            ;;
784
-
785
-        1)
786
-            #
787
-            # Upgrade
788
-            #
789
-            ;;
790
-    esac
791
-
792 766
 %preun client-libs
793 767
 
794 768
     # First argument is 0 => Uninstall
... ...
@@ -879,7 +722,125 @@ fi
879 879
             ;;
880 880
     esac
881 881
 
882
-%postun raft
882
+
883
+%post post
884
+
885
+    /bin/mkdir -m 700 -p %{_post_dbdir}
886
+
887
+    if [ -a %{_sasl2dir}/postd.conf ]; then
888
+        /bin/rm %{_sasl2dir}/postd.conf
889
+    fi
890
+
891
+    # add postd.conf to sasl2 directory
892
+    /bin/ln -s %{_datadir}/config/saslpostd.conf %{_sasl2dir}/postd.conf
893
+
894
+    /bin/mkdir -m 755 -p %{_logdir}
895
+    /bin/mkdir -m 755 -p %{_logconfdir}
896
+    if [ -a %{_logconfdir}/postd-syslog-ng.conf ]; then
897
+        /bin/rm %{_logconfdir}/postd-syslog-ng.conf
898
+    fi
899
+    /bin/ln -s %{_datadir}/config/postd-syslog-ng.conf %{_logconfdir}/postd-syslog-ng.conf
900
+
901
+    case "$1" in
902
+        1)
903
+            #
904
+            # New Installation
905
+            #
906
+            try_starting_lwregd_svc=true
907
+
908
+            if [ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ]; then
909
+                try_starting_lwregd_svc=false
910
+            fi
911
+
912
+            /bin/systemctl >/dev/null 2>&1
913
+            if [ $? -ne 0 ]; then
914
+                try_starting_lwregd_svc=false
915
+            fi
916
+
917
+            if [ $try_starting_lwregd_svc = true ]; then
918
+                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/post.reg
919
+                %{_likewise_open_bindir}/lwsm -q refresh
920
+                sleep 5
921
+            else
922
+                started_lwregd=false
923
+                if [ -z "`pidof lwregd`" ]; then
924
+                    echo "Starting lwregd"
925
+                    %{_likewise_open_sbindir}/lwregd &
926
+                    started_lwregd=true
927
+                    sleep 5
928
+                fi
929
+                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/post.reg
930
+                if [ $started_lwregd = true ]; then
931
+                    kill -TERM `pidof lwregd`
932
+                    wait
933
+                fi
934
+            fi
935
+            ;;
936
+
937
+        2)
938
+            #
939
+            # Upgrade
940
+            #
941
+            try_starting_lwregd_svc=true
942
+
943
+            if [ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ]; then
944
+                try_starting_lwregd_svc=false
945
+            fi
946
+
947
+            /bin/systemctl >/dev/null 2>&1
948
+            if [ $? -ne 0 ]; then
949
+                try_starting_lwregd_svc=false
950
+            fi
951
+
952
+            if [ $try_starting_lwregd_svc = true ]; then
953
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/post.reg
954
+                %{_likewise_open_bindir}/lwsm -q refresh
955
+                sleep 5
956
+            else
957
+                started_lwregd=false
958
+                if [ -z "`pidof lwregd`" ]; then
959
+                    echo "Starting lwregd"
960
+                    %{_likewise_open_sbindir}/lwregd &
961
+                    started_lwregd=true
962
+                    sleep 5
963
+                fi
964
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/post.reg
965
+                if [ $started_lwregd = true ]; then
966
+                    kill -TERM `pidof lwregd`
967
+                    wait
968
+                fi
969
+            fi
970
+            ;;
971
+    esac
972
+
973
+%preun post
974
+
975
+    # First argument is 0 => Uninstall
976
+    # First argument is 1 => Upgrade
977
+
978
+    case "$1" in
979
+        0)
980
+            #
981
+            # Uninstall
982
+            #
983
+            %{_likewise_open_bindir}/lwsm info post > /dev/null 2>&1
984
+            if [ $? -eq 0 ]; then
985
+                %{_likewise_open_bindir}/lwsm stop post
986
+                %{_likewise_open_bindir}/lwregshell delete_tree 'HKEY_THIS_MACHINE\Services\post'
987
+                /bin/systemctl restart lwsmd
988
+                sleep 5
989
+            fi
990
+            ;;
991
+
992
+        1)
993
+            #
994
+            # Upgrade
995
+            #
996
+            ;;
997
+    esac
998
+
999
+
1000
+%postun post
883 1001
 
884 1002
     # First argument is 0 => Uninstall
885 1003
     # First argument is 1 => Upgrade
... ...
@@ -891,7 +852,7 @@ fi
891 891
             #
892 892
             # Uninstall
893 893
             #
894
-            echo "Existing database files kept at [%{_lwraft_dbdir}]."
894
+            echo "Existing database files kept at [%{_post_dbdir}]."
895 895
             ;;
896 896
 
897 897
         1)
... ...
@@ -901,14 +862,15 @@ fi
901 901
             ;;
902 902
     esac
903 903
 
904
-    if [ -a %{_sasl2dir}/lwraftd.conf ]; then
905
-        /bin/rm %{_sasl2dir}/lwraftd.conf
904
+    if [ -a %{_sasl2dir}/postd.conf ]; then
905
+        /bin/rm %{_sasl2dir}/postd.conf
906 906
     fi
907 907
 
908 908
 %files
909 909
 
910 910
 %defattr(-,root,root,0755)
911 911
 %dir /opt/vmware/share/config
912
+%{_bindir}/configure-sts
912 913
 %{_bindir}/ic-promote
913 914
 %{_bindir}/configure-lightwave-server
914 915
 %{_bindir}/configure-identity-server
... ...
@@ -947,6 +909,7 @@ fi
947 947
 %{_datadir}/config/vmdird-syslog-ng.conf
948 948
 %{_datadir}/config/vmdir-rest.json
949 949
 %{_datadir}/config/vmdns.reg
950
+%{_datadir}/config/vmdns-rest.json
950 951
 %{_datadir}/config/vmdnsd-syslog-ng.conf
951 952
 %{_datadir}/config/idm/*
952 953
 
... ...
@@ -965,6 +928,15 @@ fi
965 965
 %{_jarsdir}/websso.jar
966 966
 %{_jarsdir}/sts.jar
967 967
 %{_jarsdir}/openidconnect-server.jar
968
+%{_jarsdir}/commons-lang-2.6.jar
969
+%{_jarsdir}/commons-logging-1.2.jar
970
+%{_jarsdir}/jna-4.2.1.jar
971
+%{_jarsdir}/httpclient-4.5.1.jar
972
+%{_jarsdir}/slf4j-api-1.7.25.jar
973
+%{_jarsdir}/log4j-api-2.8.2.jar
974
+%{_jarsdir}/log4j-slf4j-impl-2.8.2.jar
975
+%{_jarsdir}/log4j-core-2.8.2.jar
976
+
968 977
 
969 978
 %{_webappsdir}/lightwaveui.war
970 979
 %{_webappsdir}/ROOT.war
... ...
@@ -1025,7 +997,7 @@ fi
1025 1025
 %{_lib64dir}/libcdcjni.so*
1026 1026
 %{_lib64dir}/libheartbeatjni.so*
1027 1027
 %{_lib64dir}/libidm.so*
1028
-%{_lib64dir}/liblwraftclient.so*
1028
+%{_lib64dir}/libpostclient.so*
1029 1029
 %{_lib64dir}/libssoafdclient.so*
1030 1030
 %{_lib64dir}/libssocommon.so*
1031 1031
 %{_lib64dir}/libssocoreclient.so*
... ...
@@ -1033,6 +1005,7 @@ fi
1033 1033
 %{_lib64dir}/libssooidc.so*
1034 1034
 %{_lib64dir}/libssovmdirclient.so*
1035 1035
 %{_lib64dir}/libvmdirauth.so*
1036
+%{_lib64dir}/libvmmetrics.so*
1036 1037
 
1037 1038
 %{_datadir}/config/java.security.linux
1038 1039
 %{_datadir}/config/certool.cfg
... ...
@@ -1046,7 +1019,6 @@ fi
1046 1046
 %{_jreextdir}/afd-heartbeat-service.jar
1047 1047
 
1048 1048
 %{_jarsdir}/authentication-framework.jar
1049
-%{_jarsdir}/pscsetup.jar
1050 1049
 %{_jarsdir}/vmware-identity-rest-idm-samples.jar
1051 1050
 %{_jarsdir}/vmware-vmca-client.jar
1052 1051
 %{_jarsdir}/samltoken.jar
... ...
@@ -1059,7 +1031,6 @@ fi
1059 1059
 %{_jarsdir}/vmware-identity-wsTrustClient.jar
1060 1060
 %{_jarsdir}/vmware-identity-rest-afd-common.jar
1061 1061
 %{_jarsdir}/openidconnect-common.jar
1062
-%{_jarsdir}/vmware-identity-depends.jar
1063 1062
 %{_jarsdir}/openidconnect-client-lib.jar
1064 1063
 %{_jarsdir}/vmware-identity-idm-client.jar
1065 1064
 %{_jarsdir}/vmware-identity-idm-interface.jar
... ...
@@ -1069,26 +1040,6 @@ fi
1069 1069
 
1070 1070
 %{_sysconfdir}/vmware/java/vmware-override-java.security
1071 1071
 
1072
-%files raft
1073
-
1074
-%defattr(-,root,root)
1075
-
1076
-%{_sbindir}/lwraftd
1077
-
1078
-%{_bindir}/lwraft_upgrade.sh
1079
-%{_bindir}/lwraftadmintool
1080
-%{_bindir}/lwraftleavefed
1081
-%{_bindir}/lwraftpromo
1082
-%{_bindir}/lwraftschema
1083
-
1084
-%{_lib64dir}/sasl2/libsasllwraftdb.so*
1085
-
1086
-%{_datadir}/config/sasllwraftd.conf
1087
-%{_datadir}/config/lwraftschema.ldif
1088
-%{_datadir}/config/lwraft-rest.json
1089
-%{_datadir}/config/lwraft.reg
1090
-%{_datadir}/config/lwraftd-syslog-ng.conf
1091
-%{_datadir}/config/lwraft-client.reg
1092 1072
 
1093 1073
 %files devel
1094 1074
 
... ...
@@ -1109,6 +1060,7 @@ fi
1109 1109
 %{_includedir}/vmdirtypes.h
1110 1110
 %{_includedir}/vmdns.h
1111 1111
 %{_includedir}/vmdnstypes.h
1112
+%{_includedir}/vmmetrics.h
1112 1113
 
1113 1114
 # TBD - not sure if these should be included or excluded
1114 1115
 #
... ...
@@ -1119,6 +1071,7 @@ fi
1119 1119
 %{_includedir}/ssoerrors.h
1120 1120
 %{_includedir}/ssoidmclient.h
1121 1121
 %{_includedir}/ssotypes.h
1122
+%{_includedir}/ssocommon.h
1122 1123
 %{_includedir}/ssovmdirclient.h
1123 1124
 %{_includedir}/vmevent.h
1124 1125
 
... ...
@@ -1136,9 +1089,33 @@ fi
1136 1136
 %exclude %{_prefix}/site-packages/identity/*
1137 1137
 %exclude %{_webappsdir}/openidconnect-sample-rp.war
1138 1138
 
1139
+%files post
1140
+
1141
+%defattr(-,root,root)
1142
+
1143
+%{_sbindir}/postd
1144
+
1145
+%{_bindir}/postadmintool
1146
+%{_bindir}/lwraftleavefed
1147
+%{_bindir}/lwraftaclmgr
1148
+%{_bindir}/lwraftpromo
1149
+%{_bindir}/postschema
1150
+%{_bindir}/post-cli
1151
+
1152
+%{_lib64dir}/sasl2/libsaslpostdb.so*
1153
+
1154
+%{_datadir}/config/saslpostd.conf
1155
+%{_datadir}/config/postschema.ldif
1156
+%{_datadir}/config/post-rest.json
1157
+%{_datadir}/config/post.reg
1158
+%{_datadir}/config/postd-syslog-ng.conf
1159
+%{_datadir}/config/post-client.reg
1160
+
1139 1161
 # %doc ChangeLog README COPYING
1140 1162
 
1141 1163
 %changelog
1164
+*   Wed Aug 9 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.1-1
1165
+-   update to 1.3.1
1142 1166
 *   Tue Jul 18 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.1-5
1143 1167
 -   making sure client-libs install gss mechs
1144 1168
 -   make sure domainjoin works with just client installed.
... ...
@@ -1,14 +1,13 @@
1 1
 Name: 		likewise-open
2 2
 Summary: 	Likewise Open
3
-Version: 	6.2.11
3
+Version: 	6.2.11.4
4 4
 Release:        1%{?dist}
5 5
 Group: 		Development/Libraries
6 6
 Vendor:         VMware, Inc.
7 7
 License: 	GPL 2.0,LGPL 2.1
8 8
 URL: 		https://github.com/vmware/likewise-open
9 9
 Source0:        %{name}-%{version}.tar.gz
10
-%define sha1 likewise-open=88ba9280b062a3ed4830dd2e875084d2357a44f7
11
-Patch0:         gcc-6.3-compile-fix.patch
10
+%define sha1 likewise-open=6aa4cf11de6747d5f8940666c21adc3e1f7b6a4b
12 11
 Distribution:   Photon
13 12
 Requires:       Linux-PAM
14 13
 Requires:       coreutils >= 8.22
... ...
@@ -46,7 +45,6 @@ This package provides files for developing against the Likewise APIs
46 46
 
47 47
 %prep
48 48
 %setup -q
49
-%patch0 -p1
50 49
 
51 50
 %build
52 51
 cd release
... ...
@@ -277,6 +275,7 @@ rm -rf %{buildroot}/*
277 277
 /usr/lib64/gss/*.so
278 278
 /opt/likewise/lib64/lwsm-loader/*.so
279 279
 /opt/likewise/lib64/*.so
280
+/opt/likewise/lib64/krb5/plugins/libkrb5/liblwnet_service_locator.so
280 281
 %dir /var/lib/likewise
281 282
 %dir /var/lib/likewise/db
282 283
 %dir /var/lib/likewise/rpc
... ...
@@ -287,5 +286,7 @@ rm -rf %{buildroot}/*
287 287
 /opt/likewise/lib64/pkgconfig/libedit.pc
288 288
 
289 289
 %changelog
290
+*   Wed Aug 09 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.2.11.4-1
291
+-   Update to 6.2.11.4.
290 292
 *   Wed Mar 29 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.2.11-1
291 293
 -   Initial - spec modified for Photon from likewise-open git repo.