mailman-pgp-smime/mailman-2.1-build.patch

   1 diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
   2 --- mailman-2.1.12-a/bin/Makefile.in    2009-02-23 22:23:35.000000000 +0100
   3 +++ mailman-2.1.12-b/bin/Makefile.in    2009-07-28 12:19:48.000000000 +0200
   4 @@ -28,7 +28,6 @@
   5  DESTDIR=
   6
   7  CC=            @CC@
   8 -CHMOD=         @CHMOD@
   9  INSTALL=       @INSTALL@
  10
  11  DEFS=          @DEFS@
  12 @@ -56,7 +55,7 @@
  13  # Modes for directories and executables created by the install
  14  # process.  Default to group-writable directories but
  15  # user-only-writable for executables.
  16 -DIRMODE=       775
  17 +DIRMODE=       2775
  18  EXEMODE=       755
  19  FILEMODE=      644
  20  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
  21 @@ -72,8 +71,6 @@
  22             $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
  23         done
  24
  25 -finish:
  26 -
  27  clean:
  28
  29  distclean:
  30 diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
  31 --- mailman-2.1.12-a/cron/Makefile.in   2009-02-23 22:23:35.000000000 +0100
  32 +++ mailman-2.1.12-b/cron/Makefile.in   2009-07-28 12:19:48.000000000 +0200
  33 @@ -28,7 +28,6 @@
  34  DESTDIR=
  35
  36  CC=            @CC@
  37 -CHMOD=         @CHMOD@
  38  INSTALL=       @INSTALL@
  39
  40  DEFS=          @DEFS@
  41 @@ -68,8 +67,6 @@
  42             $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
  43         done
  44
  45 -finish:
  46 -
  47  clean:
  48
  49  distclean:
  50 diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in
  51 --- mailman-2.1.12-a/Mailman/Archiver/Makefile.in       2009-02-23 22:23:35.000000000 +0100
  52 +++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in       2009-07-28 12:19:48.000000000 +0200
  53 @@ -28,7 +28,6 @@
  54  DESTDIR=
  55
  56  CC=            @CC@
  57 -CHMOD=         @CHMOD@
  58  INSTALL=       @INSTALL@
  59
  60  DEFS=          @DEFS@
  61 @@ -47,7 +46,7 @@
  62  # Modes for directories and executables created by the install
  63  # process.  Default to group-writable directories but
  64  # user-only-writable for executables.
  65 -DIRMODE=       775
  66 +DIRMODE=       2775
  67  EXEMODE=       755
  68  FILEMODE=      644
  69  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
  70 @@ -63,8 +62,6 @@
  71             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
  72         done
  73
  74 -finish:
  75 -
  76  clean:
  77
  78  distclean:
  79 diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in
  80 --- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in       2009-02-23 22:23:35.000000000 +0100
  81 +++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in       2009-07-28 12:19:48.000000000 +0200
  82 @@ -28,7 +28,6 @@
  83  DESTDIR=
  84
  85  CC=            @CC@
  86 -CHMOD=         @CHMOD@
  87  INSTALL=       @INSTALL@
  88
  89  DEFS=          @DEFS@
  90 @@ -45,7 +44,7 @@
  91  # Modes for directories and executables created by the install
  92  # process.  Default to group-writable directories but
  93  # user-only-writable for executables.
  94 -DIRMODE=       775
  95 +DIRMODE=       2775
  96  EXEMODE=       755
  97  FILEMODE=      644
  98  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
  99 @@ -61,8 +60,6 @@
 100             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 101         done
 102
 103 -finish:
 104 -
 105  clean:
 106
 107  distclean:
 108 diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in
 109 --- mailman-2.1.12-a/Mailman/Cgi/Makefile.in    2009-02-23 22:23:35.000000000 +0100
 110 +++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in    2009-07-28 12:19:48.000000000 +0200
 111 @@ -28,7 +28,6 @@
 112  DESTDIR=
 113
 114  CC=            @CC@
 115 -CHMOD=         @CHMOD@
 116  INSTALL=       @INSTALL@
 117
 118  DEFS=          @DEFS@
 119 @@ -47,7 +46,7 @@
 120  # Modes for directories and executables created by the install
 121  # process.  Default to group-writable directories but
 122  # user-only-writable for executables.
 123 -DIRMODE=       775
 124 +DIRMODE=       2775
 125  EXEMODE=       755
 126  FILEMODE=      644
 127  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 128 @@ -63,8 +62,6 @@
 129             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
 130          done
 131
 132 -finish:
 133 -
 134  clean:
 135
 136  distclean:
 137 diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in
 138 --- mailman-2.1.12-a/Mailman/Commands/Makefile.in       2009-02-23 22:23:35.000000000 +0100
 139 +++ mailman-2.1.12-b/Mailman/Commands/Makefile.in       2009-07-28 12:19:48.000000000 +0200
 140 @@ -28,7 +28,6 @@
 141  DESTDIR=
 142
 143  CC=            @CC@
 144 -CHMOD=         @CHMOD@
 145  INSTALL=       @INSTALL@
 146
 147  DEFS=          @DEFS@
 148 @@ -45,7 +44,7 @@
 149  # Modes for directories and executables created by the install
 150  # process.  Default to group-writable directories but
 151  # user-only-writable for executables.
 152 -DIRMODE=       775
 153 +DIRMODE=       2775
 154  EXEMODE=       755
 155  FILEMODE=      644
 156  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 157 @@ -61,8 +60,6 @@
 158             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 159         done
 160
 161 -finish:
 162 -
 163  clean:
 164
 165  distclean:
 166 diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in
 167 --- mailman-2.1.12-a/Mailman/Gui/Makefile.in    2009-02-23 22:23:35.000000000 +0100
 168 +++ mailman-2.1.12-b/Mailman/Gui/Makefile.in    2009-07-28 12:19:48.000000000 +0200
 169 @@ -28,7 +28,6 @@
 170  DESTDIR=
 171
 172  CC=            @CC@
 173 -CHMOD=         @CHMOD@
 174  INSTALL=       @INSTALL@
 175
 176  DEFS=          @DEFS@
 177 @@ -45,7 +44,7 @@
 178  # Modes for directories and executables created by the install
 179  # process.  Default to group-writable directories but
 180  # user-only-writable for executables.
 181 -DIRMODE=       775
 182 +DIRMODE=       2775
 183  EXEMODE=       755
 184  FILEMODE=      644
 185  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 186 @@ -61,8 +60,6 @@
 187             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 188         done
 189
 190 -finish:
 191 -
 192  clean:
 193
 194  distclean:
 195 diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in
 196 --- mailman-2.1.12-a/Mailman/Handlers/Makefile.in       2009-02-23 22:23:35.000000000 +0100
 197 +++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in       2009-07-28 12:19:48.000000000 +0200
 198 @@ -28,7 +28,6 @@
 199  DESTDIR=
 200
 201  CC=            @CC@
 202 -CHMOD=         @CHMOD@
 203  INSTALL=       @INSTALL@
 204
 205  DEFS=          @DEFS@
 206 @@ -45,7 +44,7 @@
 207  # Modes for directories and executables created by the install
 208  # process.  Default to group-writable directories but
 209  # user-only-writable for executables.
 210 -DIRMODE=       775
 211 +DIRMODE=       2775
 212  EXEMODE=       755
 213  FILEMODE=      644
 214  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 215 @@ -61,8 +60,6 @@
 216             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 217         done
 218
 219 -finish:
 220 -
 221  clean:
 222
 223  distclean:
 224 diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in
 225 --- mailman-2.1.12-a/Mailman/Logging/Makefile.in        2009-02-23 22:23:35.000000000 +0100
 226 +++ mailman-2.1.12-b/Mailman/Logging/Makefile.in        2009-07-28 12:19:48.000000000 +0200
 227 @@ -28,7 +28,6 @@
 228  DESTDIR=
 229
 230  CC=            @CC@
 231 -CHMOD=         @CHMOD@
 232  INSTALL=       @INSTALL@
 233
 234  DEFS=          @DEFS@
 235 @@ -45,7 +44,7 @@
 236  # Modes for directories and executables created by the install
 237  # process.  Default to group-writable directories but
 238  # user-only-writable for executables.
 239 -DIRMODE=       775
 240 +DIRMODE=       2775
 241  EXEMODE=       755
 242  FILEMODE=      644
 243  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 244 @@ -61,8 +60,6 @@
 245             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 246         done
 247
 248 -finish:
 249 -
 250  clean:
 251
 252  distclean:
 253 diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in
 254 --- mailman-2.1.12-a/Mailman/Makefile.in        2009-02-23 22:23:35.000000000 +0100
 255 +++ mailman-2.1.12-b/Mailman/Makefile.in        2009-07-28 12:19:48.000000000 +0200
 256 @@ -20,8 +20,6 @@
 257
 258  # Variables set by configure
 259
 260 -VERSION=       @VERSION@
 261 -
 262  VPATH=         @srcdir@
 263  srcdir=        @srcdir@
 264  bindir=        @bindir@
 265 @@ -30,7 +28,6 @@
 266  DESTDIR=
 267
 268  CC=            @CC@
 269 -CHMOD=         @CHMOD@
 270  INSTALL=       @INSTALL@
 271
 272  DEFS=          @DEFS@
 273 @@ -48,7 +45,7 @@
 274  # Modes for directories and executables created by the install
 275  # process.  Default to group-writable directories but
 276  # user-only-writable for executables.
 277 -DIRMODE=       775
 278 +DIRMODE=       2775
 279  EXEMODE=       755
 280  FILEMODE=      644
 281  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 282 @@ -79,12 +76,6 @@
 283             (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
 284         done
 285
 286 -finish:
 287 -       @for d in $(SUBDIRS); \
 288 -       do \
 289 -           (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \
 290 -       done
 291 -
 292  clean:
 293         for d in $(SUBDIRS); \
 294         do \
 295 diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in
 296 --- mailman-2.1.12-a/Mailman/MTA/Makefile.in    2009-02-23 22:23:35.000000000 +0100
 297 +++ mailman-2.1.12-b/Mailman/MTA/Makefile.in    2009-07-28 12:19:48.000000000 +0200
 298 @@ -28,7 +28,6 @@
 299  DESTDIR=
 300
 301  CC=            @CC@
 302 -CHMOD=         @CHMOD@
 303  INSTALL=       @INSTALL@
 304
 305  DEFS=          @DEFS@
 306 @@ -45,7 +44,7 @@
 307  # Modes for directories and executables created by the install
 308  # process.  Default to group-writable directories but
 309  # user-only-writable for executables.
 310 -DIRMODE=       775
 311 +DIRMODE=       2775
 312  EXEMODE=       755
 313  FILEMODE=      644
 314  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 315 @@ -61,8 +60,6 @@
 316             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 317         done
 318
 319 -finish:
 320 -
 321  clean:
 322
 323  distclean:
 324 diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in
 325 --- mailman-2.1.12-a/Mailman/Queue/Makefile.in  2009-02-23 22:23:35.000000000 +0100
 326 +++ mailman-2.1.12-b/Mailman/Queue/Makefile.in  2009-07-28 12:19:48.000000000 +0200
 327 @@ -28,7 +28,6 @@
 328  DESTDIR=
 329
 330  CC=            @CC@
 331 -CHMOD=         @CHMOD@
 332  INSTALL=       @INSTALL@
 333
 334  DEFS=          @DEFS@
 335 @@ -45,7 +44,7 @@
 336  # Modes for directories and executables created by the install
 337  # process.  Default to group-writable directories but
 338  # user-only-writable for executables.
 339 -DIRMODE=       775
 340 +DIRMODE=       2775
 341  EXEMODE=       755
 342  FILEMODE=      644
 343  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 344 @@ -61,8 +60,6 @@
 345             $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
 346         done
 347
 348 -finish:
 349 -
 350  clean:
 351
 352  distclean:
 353 diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
 354 --- mailman-2.1.12-a/Makefile.in        2009-02-23 22:23:35.000000000 +0100
 355 +++ mailman-2.1.12-b/Makefile.in        2009-07-28 12:19:48.000000000 +0200
 356 @@ -61,11 +61,10 @@
 357  # Modes for directories and executables created by the install
 358  # process.  Default to group-writable directories but
 359  # user-only-writable for executables.
 360 -DIRMODE=       775
 361 +DIRMODE=       2775
 362  EXEMODE=       755
 363  FILEMODE=      644
 364  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 365 -DIRSETGID=     chmod g+s
 366
 367  DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
 368  LANGPACK = README-I18N.en templates messages
 369 @@ -85,14 +84,24 @@
 370
 371  doinstall: $(SUBDIRS)
 372         @echo "Creating architecture independent directories..."
 373 +       dir=$(DESTDIR)$(prefix); \
 374 +       if test ! -d $$dir; then \
 375 +               echo "Creating directory hierarchy $$dir"; \
 376 +               $(INSTALL) -d -m $(DIRMODE) $$dir; \
 377 +       else true; \
 378 +       fi;
 379 +       dir=$(DESTDIR)$(var_prefix); \
 380 +       if test ! -d $$dir; then \
 381 +               echo "Creating directory hierarchy $$dir"; \
 382 +               $(INSTALL) -d -m $(DIRMODE) $$dir; \
 383 +       else true; \
 384 +       fi;
 385         @for d in $(VAR_DIRS); \
 386         do \
 387             dir=$(DESTDIR)$(var_prefix)/$$d; \
 388             if test ! -d $$dir; then \
 389                 echo "Creating directory hierarchy $$dir"; \
 390 -               $(srcdir)/mkinstalldirs $$dir; \
 391 -               chmod $(DIRMODE) $$dir; \
 392 -               $(DIRSETGID) $$dir; \
 393 +               $(INSTALL) -d -m $(DIRMODE) $$dir; \
 394             else true; \
 395             fi; \
 396         done
 397 @@ -102,9 +111,7 @@
 398             dir=$(DESTDIR)$(prefix)/$$d; \
 399             if test ! -d $$dir; then \
 400                 echo "Creating directory hierarchy $$dir"; \
 401 -               $(srcdir)/mkinstalldirs $$dir; \
 402 -               chmod $(DIRMODE) $$dir; \
 403 -               $(DIRSETGID) $$dir; \
 404 +               $(INSTALL) -d -m $(DIRMODE) $$dir; \
 405             else true; \
 406             fi; \
 407         done
 408 @@ -114,9 +121,7 @@
 409             dir=$(DESTDIR)$(exec_prefix)/$$d; \
 410             if test ! -d $$dir; then \
 411                 echo "Creating directory hierarchy $$dir"; \
 412 -               $(srcdir)/mkinstalldirs $$dir; \
 413 -               chmod $(DIRMODE) $$dir; \
 414 -               $(DIRSETGID) $$dir; \
 415 +               $(INSTALL) -d -m $(DIRMODE) $$dir; \
 416             else true; \
 417             fi; \
 418         done
 419 diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in
 420 --- mailman-2.1.12-a/messages/Makefile.in       2009-02-23 22:23:35.000000000 +0100
 421 +++ mailman-2.1.12-b/messages/Makefile.in       2009-07-28 12:19:48.000000000 +0200
 422 @@ -32,7 +32,6 @@
 423  DESTDIR=
 424
 425  CC=            @CC@
 426 -CHMOD=         @CHMOD@
 427  INSTALL=       @INSTALL@
 428
 429  DEFS=          @DEFS@
 430 @@ -43,7 +42,6 @@
 431  CFLAGS=                $(OPT) $(DEFS)
 432  PACKAGEDIR=    $(prefix)/messages
 433  SHELL=         /bin/sh
 434 -DIRSETGID=     chmod g+s
 435  MSGFMT=        @PYTHON@ ../build/bin/msgfmt.py
 436  MSGMERGE=      msgmerge
 437
 438 @@ -60,7 +58,7 @@
 439  # Modes for directories and executables created by the install
 440  # process.  Default to group-writable directories but
 441  # user-only-writable for executables.
 442 -DIRMODE=       775
 443 +DIRMODE=       2775
 444  EXEMODE=       755
 445  FILEMODE=      644
 446  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 447 @@ -90,9 +88,8 @@
 448         do \
 449             dir=$(DESTDIR)$(prefix)/$$d; \
 450             echo "Creating language directory $$dir"; \
 451 -           $(srcdir)/../mkinstalldirs $$dir; \
 452 -           chmod $(DIRMODE) $$dir; \
 453 -           $(DIRSETGID) $$dir; \
 454 +           $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \
 455 +           $(INSTALL) -d -m $(DIRMODE) $$dir; \
 456         done
 457         @for d in $(LANGUAGES); \
 458         do \
 459 @@ -113,8 +110,6 @@
 460
 461  mofiles: $(MOFILES)
 462
 463 -finish:
 464 -
 465  clean:
 466         -rm -f */LC_MESSAGES/mailman.mo
 467
 468 diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
 469 --- mailman-2.1.12-a/misc/Makefile.in   2009-02-23 22:23:35.000000000 +0100
 470 +++ mailman-2.1.12-b/misc/Makefile.in   2009-07-28 12:19:48.000000000 +0200
 471 @@ -30,7 +30,6 @@
 472  DESTDIR=
 473
 474  CC=            @CC@
 475 -CHMOD=         @CHMOD@
 476  INSTALL=       @INSTALL@
 477  PYTHON=                @PYTHON@
 478
 479 @@ -62,7 +61,7 @@
 480  # Modes for directories and executables created by the install
 481  # process.  Default to group-writable directories but
 482  # user-only-writable for executables.
 483 -DIRMODE=       775
 484 +DIRMODE=       2775
 485  EXEMODE=       755
 486  FILEMODE=      644
 487  DATAMODE=      664
 488 @@ -101,8 +100,6 @@
 489             (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
 490         done
 491
 492 -finish:
 493 -
 494  clean:
 495
 496  distclean:
 497 diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in
 498 --- mailman-2.1.12-a/scripts/Makefile.in        2009-02-23 22:23:35.000000000 +0100
 499 +++ mailman-2.1.12-b/scripts/Makefile.in        2009-07-28 12:19:48.000000000 +0200
 500 @@ -28,7 +28,6 @@
 501  DESTDIR=
 502
 503  CC=            @CC@
 504 -CHMOD=         @CHMOD@
 505  INSTALL=       @INSTALL@
 506
 507  DEFS=          @DEFS@
 508 @@ -49,7 +48,7 @@
 509  # Modes for directories and executables created by the install
 510  # process.  Default to group-writable directories but
 511  # user-only-writable for executables.
 512 -DIRMODE=       775
 513 +DIRMODE=       2775
 514  EXEMODE=       755
 515  FILEMODE=      644
 516  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 517 @@ -68,8 +67,6 @@
 518         $(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
 519         $(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
 520
 521 -finish:
 522 -
 523  clean:
 524
 525  distclean:
 526 diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
 527 --- mailman-2.1.12-a/src/Makefile.in    2009-07-28 12:19:47.000000000 +0200
 528 +++ mailman-2.1.12-b/src/Makefile.in    2009-07-28 12:19:48.000000000 +0200
 529 @@ -28,7 +28,6 @@
 530  DESTDIR=
 531
 532  CC=            @CC@
 533 -CHMOD=         @CHMOD@
 534  INSTALL=       @INSTALL@
 535  PYTHON=        @PYTHON@
 536
 537 @@ -63,10 +62,9 @@
 538  # Modes for directories and executables created by the install
 539  # process.  Default to group-writable directories but
 540  # user-only-writable for executables.
 541 -DIRMODE=       775
 542 -EXEMODE=       755
 543 +DIRMODE=       2775
 544 +EXEMODE=       2755
 545  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 546 -DIRSETGID=     chmod g+s
 547
 548  # Fixed definitions
 549
 550 @@ -110,20 +108,10 @@
 551         do \
 552             exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
 553             $(INSTALL_PROGRAM) $$f $$exe; \
 554 -           $(DIRSETGID) $$exe; \
 555         done
 556         for f in $(MAIL_PROGS); \
 557         do \
 558             $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \
 559 -           $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \
 560 -       done
 561 -
 562 -finish:
 563 -       -for f in $(SUID_CGI_PROGS); \
 564 -       do \
 565 -           exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
 566 -           chown $(MAILMAN_USER) $$exe; \
 567 -           chmod u+s $$exe; \
 568         done
 569
 570  clean:
 571 diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in
 572 --- mailman-2.1.12-a/templates/Makefile.in      2009-02-23 22:23:35.000000000 +0100
 573 +++ mailman-2.1.12-b/templates/Makefile.in      2009-07-28 12:19:48.000000000 +0200
 574 @@ -28,7 +28,6 @@
 575  DESTDIR=
 576
 577  CC=            @CC@
 578 -CHMOD=         @CHMOD@
 579  INSTALL=       @INSTALL@
 580  TRUE=          @TRUE@
 581
 582 @@ -48,7 +47,7 @@
 583  # Modes for directories and executables created by the install
 584  # process.  Default to group-writable directories but
 585  # user-only-writable for executables.
 586 -DIRMODE=       775
 587 +DIRMODE=       2775
 588  EXEMODE=       755
 589  FILEMODE=      644
 590  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 591 @@ -61,15 +60,13 @@
 592  install:
 593         for d in $(LANGUAGES); \
 594         do \
 595 -           $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
 596 +           $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \
 597             for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
 598             do \
 599                 $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
 600             done; \
 601         done
 602
 603 -finish:
 604 -
 605  clean:
 606
 607  distclean:
 608 diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in
 609 --- mailman-2.1.12-a/tests/bounces/Makefile.in  2009-02-23 22:23:35.000000000 +0100
 610 +++ mailman-2.1.12-b/tests/bounces/Makefile.in  2009-07-28 12:19:48.000000000 +0200
 611 @@ -28,7 +28,6 @@
 612  DESTDIR=
 613
 614  CC=            @CC@
 615 -CHMOD=         @CHMOD@
 616  INSTALL=       @INSTALL@
 617
 618  DEFS=          @DEFS@
 619 @@ -46,7 +45,7 @@
 620  # Modes for directories and executables created by the install
 621  # process.  Default to group-writable directories but
 622  # user-only-writable for executables.
 623 -DIRMODE=       775
 624 +DIRMODE=       2775
 625  EXEMODE=       755
 626  FILEMODE=      644
 627  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 628 @@ -60,8 +59,6 @@
 629             $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
 630         done
 631
 632 -finish:
 633 -
 634  clean:
 635
 636  distclean:
 637 diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
 638 --- mailman-2.1.12-a/tests/Makefile.in  2009-02-23 22:23:35.000000000 +0100
 639 +++ mailman-2.1.12-b/tests/Makefile.in  2009-07-28 12:19:48.000000000 +0200
 640 @@ -28,7 +28,6 @@
 641  DESTDIR=
 642
 643  CC=            @CC@
 644 -CHMOD=         @CHMOD@
 645  INSTALL=       @INSTALL@
 646
 647  DEFS=          @DEFS@
 648 @@ -46,7 +45,7 @@
 649  # Modes for directories and executables created by the install
 650  # process.  Default to group-writable directories but
 651  # user-only-writable for executables.
 652 -DIRMODE=       775
 653 +DIRMODE=       2775
 654  EXEMODE=       755
 655  FILEMODE=      644
 656  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 657 @@ -71,8 +70,6 @@
 658             (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
 659         done
 660
 661 -finish:
 662 -
 663  clean:
 664
 665  distclean:
 666 diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in
 667 --- mailman-2.1.12-a/tests/msgs/Makefile.in     2009-02-23 22:23:35.000000000 +0100
 668 +++ mailman-2.1.12-b/tests/msgs/Makefile.in     2009-07-28 12:19:48.000000000 +0200
 669 @@ -28,7 +28,6 @@
 670  DESTDIR=
 671
 672  CC=            @CC@
 673 -CHMOD=         @CHMOD@
 674  INSTALL=       @INSTALL@
 675
 676  DEFS=          @DEFS@
 677 @@ -46,7 +45,7 @@
 678  # Modes for directories and executables created by the install
 679  # process.  Default to group-writable directories but
 680  # user-only-writable for executables.
 681 -DIRMODE=       775
 682 +DIRMODE=       2775
 683  EXEMODE=       755
 684  FILEMODE=      644
 685  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
 686 @@ -60,8 +59,6 @@
 687             $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
 688         done
 689
 690 -finish:
 691 -
 692  clean:
 693
 694  distclean: