ChatServer-409

Imported from ChatServer-409.tar.gz
NewUdom68 · Oct 6, 2021 · 3910423 · 3910423
1 parent aab7377
commit 3910423
Show file tree

Hide file tree

Showing 32 changed files with 791 additions and 231 deletions.
diff --git a/Makefile b/Makefile
@@ -67,6 +67,7 @@ MAN_DIR	= usr/share/man
 INFO_DIR	= usr/share/info
 MIGRATION_EXTRAS_DIR	= System/Library/ServerSetup/MigrationExtras
 PROMOTION_EXTRAS_DIR	= System/Library/ServerSetup/PromotionExtras
+COMMON_EXTRAS_DIR	= System/Library/ServerSetup/CommonExtras
 RESTORE_EXTRAS_DIR	= System/Library/ServerSetup/RestoreExtras
 JABBERD_BIN_DIR=$(SERVER_INSTALL_PATH_PREFIX)/usr/libexec/jabberd
 
@@ -405,6 +406,7 @@ authreg_apple_od.so \
 mod_active.0.so \
 mod_amp.0.so \
 mod_announce.0.so \
+mod_autobuddy.0.so \
 mod_deliver.0.so \
 mod_disco.0.so \
 mod_echo.0.so \
@@ -505,9 +507,10 @@ jabberd2/makeinstall:
 	$(SILENT) $(INSTALL) -m 755 -o root -g wheel $(OBJROOT)/$(JABBERD2_INSTALL_DIR)/$(firstword $(JABBERD2_ARCHS))/$(JABBERD_BIN_DIR)/jabberd $(OBJROOT)/$(JABBERD2_INSTALL_DIR)/$(JABBERD_BIN_DIR)
 	$(SILENT) $(MKDIRS) $(SYMROOT)/$(JABBERD_MODULES_DIR)
 	$(SILENT) $(MKDIRS) $(OBJROOT)/$(JABBERD2_INSTALL_DIR)/$(JABBERD_MODULES_DIR)
+# we don't want to ship .la files
+	$(SILENT) $(RM) -f $(OBJROOT)/$(JABBERD2_INSTALL_DIR)/$(firstword $(JABBERD2_ARCHS))/$(JABBERD_MODULES_DIR)/*.la
 # authreg_sqlite gets built, but we don't want it.
 	$(SILENT) $(RM) -f $(OBJROOT)/$(JABBERD2_INSTALL_DIR)/$(firstword $(JABBERD2_ARCHS))/$(JABBERD_MODULES_DIR)/authreg_sqlite.so
-	$(SILENT) $(RM) -f $(OBJROOT)/$(JABBERD2_INSTALL_DIR)/$(firstword $(JABBERD2_ARCHS))/$(JABBERD_MODULES_DIR)/authreg_sqlite.la
 # Copy symlinks for jabberd2 modules
 	$(SILENT) $(DITTO) $(OBJROOT)/$(JABBERD2_INSTALL_DIR)/$(firstword $(JABBERD2_ARCHS))/$(JABBERD_MODULES_DIR) $(OBJROOT)/$(JABBERD2_INSTALL_DIR)/$(JABBERD_MODULES_DIR)
 #  This is not working, but it would be nice to make the list of shared libs dynamic based on what jabberd2 builds.
@@ -559,7 +562,7 @@ jabberd2/clean-all:
 
 BACKUPRESTORE_SRC_DIR=backup_restore
 MIGRATION_SRC_DIR=migration
-PROMOTION_SRC_DIR=promotion
+PROMOTION_SRC_DIR=common_extras
 RESTORE_SRC_DIR=restore_extras
 INITIALIZATION_SRC_DIR=initialization
 
@@ -669,9 +672,9 @@ install/migration:
 	$(SILENT) $(CP) $(SRCROOT)/$(MIGRATION_SRC_DIR)/jabber_data_migrate_2.0-2.2.pl $(OBJROOT)/$(STAGING_DIR)/$(LIBEXEC_DIR)/
 
 install/promotion:
-	@echo "# `date +%Y/%m/%d\ %H:%M:%S` ChatServer: [staging]: ...copying PromotionExtras"
-	$(SILENT) $(MKDIR) -p -m 755 $(OBJROOT)/$(STAGING_DIR)/$(PROMOTION_EXTRAS_DIR)
-	$(SILENT) $(CP) $(SRCROOT)/$(PROMOTION_SRC_DIR)/70-message_server_promotion.sh $(OBJROOT)/$(STAGING_DIR)/$(PROMOTION_EXTRAS_DIR)/
+	@echo "# `date +%Y/%m/%d\ %H:%M:%S` ChatServer: [staging]: ...copying CommonExtras"
+	$(SILENT) $(MKDIR) -p -m 755 $(OBJROOT)/$(STAGING_DIR)/$(COMMON_EXTRAS_DIR)
+	$(SILENT) $(CP) $(SRCROOT)/$(PROMOTION_SRC_DIR)/70-message_server_common_extra.pl $(OBJROOT)/$(STAGING_DIR)/$(COMMON_EXTRAS_DIR)/
 
 install/restore_extras:
 	@echo "# `date +%Y/%m/%d\ %H:%M:%S` ChatServer: [staging]: ...copying RestoreExtras"

diff --git a/apple_patch/pre_configure/jabberd2/configure.patch b/apple_patch/pre_configure/jabberd2/configure.patch
@@ -5,7 +5,7 @@
  PACKAGE_NAME='jabberd'
  PACKAGE_TARNAME='jabberd'
 -PACKAGE_VERSION='2.2.17'
-+PACKAGE_VERSION='2.2.17-399'
++PACKAGE_VERSION='2.2.17-409'
  PACKAGE_STRING='jabberd 2.2.17'
  PACKAGE_BUGREPORT='[email protected]'
  PACKAGE_URL=''

diff --git a/apple_patch/pre_configure/jabberd2/s2s/out.c.patch b/apple_patch/pre_configure/jabberd2/s2s/out.c.patch
@@ -1,5 +1,14 @@
 --- /tmp/jabberd-2.2.17/s2s/out.c	2012-08-21 23:03:58.000000000 -0700
-+++ ./jabberd2/s2s/out.c	2012-08-28 18:49:00.000000000 -0700
++++ ./jabberd2/s2s/out.c	2012-12-11 19:06:53.000000000 -0800
+@@ -627,7 +627,7 @@ int out_packet(s2s_t s2s, pkt_t pkt) {
+             nad_free(pkt->nad);
+         free(pkt);
+
+-        return;
++        return -1;
+     }
+
+     /* new route key */
 @@ -1570,7 +1570,7 @@ static int _out_sx_callback(sx_t s, sx_e
                          elem = nad_find_elem(nad, 0, ns, "starttls", 1);
                          if(elem >= 0) {

diff --git a/apple_patch/pre_configure/jabberd2/sm/Makefile.am.patch b/apple_patch/pre_configure/jabberd2/sm/Makefile.am.patch
@@ -0,0 +1,23 @@
+--- jabberd-2.2.17/sm/Makefile.am	2011-10-30 11:46:36.000000000 -0700
++++ jabberd/sm/Makefile.am	2013-06-17 15:11:58.000000000 -0700
+@@ -5,6 +5,7 @@
+ pkglib_LTLIBRARIES = mod_active.la \
+                   mod_announce.la \
+                   mod_amp.la \
++                  mod_autobuddy.la \
+                   mod_deliver.la \
+                   mod_disco.la \
+                   mod_echo.la \
+@@ -68,6 +69,12 @@
+ mod_amp_la_LIBADD = $(top_builddir)/subst/libsubst.la
+ endif
+
++mod_autobuddy_la_SOURCES = mod_autobuddy.c
++mod_autobuddy_la_LDFLAGS = -module -export-dynamic
++if USE_LIBSUBST
++mod_autobuddy_la_LIBADD = $(top_builddir)/subst/libsubst.la
++endif
++
+ mod_deliver_la_SOURCES = mod_deliver.c
+ mod_deliver_la_LDFLAGS = -module -export-dynamic
+ if USE_LIBSUBST
diff --git a/apple_patch/pre_configure/jabberd2/sm/Makefile.in.patch b/apple_patch/pre_configure/jabberd2/sm/Makefile.in.patch
@@ -1,5 +1,5 @@
---- /tmp/jabberd-2.2.17/sm/Makefile.in	2012-08-26 04:59:55.000000000 -0700
-+++ ./jabberd2/sm/Makefile.in	2012-08-28 18:49:00.000000000 -0700
+--- jabberd-2.2.17/sm/Makefile.in	2012-08-26 04:59:55.000000000 -0700
++++ jabberd/sm/Makefile.in	2013-06-17 15:50:10.000000000 -0700
 @@ -20,7 +20,7 @@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
@@ -9,3 +9,70 @@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
+@@ -100,6 +100,13 @@
+ mod_announce_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(mod_announce_la_LDFLAGS) $(LDFLAGS) -o $@
++@USE_LIBSUBST_TRUE@mod_autobuddy_la_DEPENDENCIES =  \
++@USE_LIBSUBST_TRUE@	$(top_builddir)/subst/libsubst.la
++am_mod_autobuddy_la_OBJECTS = mod_autobuddy.lo
++mod_autobuddy_la_OBJECTS = $(am_mod_autobuddy_la_OBJECTS)
++mod_autobuddy_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(mod_autobuddy_la_LDFLAGS) $(LDFLAGS) -o $@
+ @USE_LIBSUBST_TRUE@mod_deliver_la_DEPENDENCIES =  \
+ @USE_LIBSUBST_TRUE@	$(top_builddir)/subst/libsubst.la
+ am_mod_deliver_la_OBJECTS = mod_deliver.lo
+@@ -273,7 +280,7 @@
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+ SOURCES = $(mod_active_la_SOURCES) $(mod_amp_la_SOURCES) \
+-	$(mod_announce_la_SOURCES) $(mod_deliver_la_SOURCES) \
++	$(mod_announce_la_SOURCES) $(mod_autobuddy_la_SOURCES) $(mod_deliver_la_SOURCES) \
+ 	$(mod_disco_la_SOURCES) $(mod_echo_la_SOURCES) \
+ 	$(mod_help_la_SOURCES) $(mod_iq_last_la_SOURCES) \
+ 	$(mod_iq_ping_la_SOURCES) $(mod_iq_private_la_SOURCES) \
+@@ -286,7 +293,7 @@
+ 	$(mod_vacation_la_SOURCES) $(mod_validate_la_SOURCES) \
+ 	$(sm_SOURCES)
+ DIST_SOURCES = $(mod_active_la_SOURCES) $(mod_amp_la_SOURCES) \
+-	$(mod_announce_la_SOURCES) $(mod_deliver_la_SOURCES) \
++	$(mod_announce_la_SOURCES) $(mod_autobuddy_la_SOURCES) $(mod_deliver_la_SOURCES) \
+ 	$(mod_disco_la_SOURCES) $(mod_echo_la_SOURCES) \
+ 	$(mod_help_la_SOURCES) $(mod_iq_last_la_SOURCES) \
+ 	$(mod_iq_ping_la_SOURCES) $(mod_iq_private_la_SOURCES) \
+@@ -439,6 +446,7 @@
+ pkglib_LTLIBRARIES = mod_active.la \
+                   mod_announce.la \
+                   mod_amp.la \
++                  mod_autobuddy.la \
+                   mod_deliver.la \
+                   mod_disco.la \
+                   mod_echo.la \
+@@ -487,6 +495,9 @@
+ mod_amp_la_SOURCES = mod_amp.c
+ mod_amp_la_LDFLAGS = -module -export-dynamic
+ @USE_LIBSUBST_TRUE@mod_amp_la_LIBADD = $(top_builddir)/subst/libsubst.la
++mod_autobuddy_la_SOURCES = mod_autobuddy.c
++mod_autobuddy_la_LDFLAGS = -module -export-dynamic -framework OpenDirectory -framework CoreFoundation
++@USE_LIBSUBST_TRUE@mod_autobuddy_la_LIBADD = $(top_builddir)/subst/libsubst.la
+ mod_deliver_la_SOURCES = mod_deliver.c
+ mod_deliver_la_LDFLAGS = -module -export-dynamic
+ @USE_LIBSUBST_TRUE@mod_deliver_la_LIBADD = $(top_builddir)/subst/libsubst.la
+@@ -621,6 +632,8 @@
+ 	$(mod_amp_la_LINK) -rpath $(pkglibdir) $(mod_amp_la_OBJECTS) $(mod_amp_la_LIBADD) $(LIBS)
+ mod_announce.la: $(mod_announce_la_OBJECTS) $(mod_announce_la_DEPENDENCIES) $(EXTRA_mod_announce_la_DEPENDENCIES) 
+ 	$(mod_announce_la_LINK) -rpath $(pkglibdir) $(mod_announce_la_OBJECTS) $(mod_announce_la_LIBADD) $(LIBS)
++mod_autobuddy.la: $(mod_autobuddy_la_OBJECTS) $(mod_autobuddy_la_DEPENDENCIES) $(EXTRA_mod_autobuddy_la_DEPENDENCIES)
++	$(mod_autobuddy_la_LINK) -rpath $(pkglibdir) $(mod_autobuddy_la_OBJECTS) $(mod_autobuddy_la_LIBADD) $(LIBS)
+ mod_deliver.la: $(mod_deliver_la_OBJECTS) $(mod_deliver_la_DEPENDENCIES) $(EXTRA_mod_deliver_la_DEPENDENCIES) 
+ 	$(mod_deliver_la_LINK) -rpath $(pkglibdir) $(mod_deliver_la_OBJECTS) $(mod_deliver_la_LIBADD) $(LIBS)
+ mod_disco.la: $(mod_disco_la_OBJECTS) $(mod_disco_la_DEPENDENCIES) $(EXTRA_mod_disco_la_DEPENDENCIES) 
+@@ -719,6 +732,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_active.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_amp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_announce.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_autobuddy.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_deliver.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_disco.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_echo.Plo@am__quote@