Skip to content

Commit

Permalink
moved repository to indimail org
Browse files Browse the repository at this point in the history
mbhangui committed Dec 31, 2023
1 parent 9b492de commit c60f3c6
Showing 54 changed files with 91 additions and 75 deletions.
6 changes: 3 additions & 3 deletions .github/CREATE-Packages.md
Original file line number Diff line number Diff line change
@@ -10,9 +10,9 @@ For this to work you need few things to be installed on your system. Check your

```
$ cd /usr/local/src
$ git clone https://github.com/mbhangui/libqmail.git
$ git clone https://github.com/mbhangui/indimail-mta.git
$ git clone https://github.com/mbhangui/indimail-virtualdomains.git
$ git clone https://github.com/indimail/libqmail.git
$ git clone https://github.com/indimail/indimail-mta.git
$ git clone https://github.com/indimail/indimail-virtualdomains.git
```

## Build libqmail package
9 changes: 6 additions & 3 deletions daemontools-x/PKGBUILD.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Maintainer: @email@
# $Log: PKGBUILD.in,v $
# Revision 1.5 2023-12-31 08:59:09+05:30 Cprogrammer
# moved repository to indimail org
#
# Revision 1.4 2022-11-22 19:08:11+05:30 Cprogrammer
# added gzip to makedepends
#
@@ -13,14 +16,14 @@
# Initial revision
#
#
# $Id: PKGBUILD.in,v 1.4 2022-11-22 19:08:11+05:30 Cprogrammer Exp mbhangui $
# $Id: PKGBUILD.in,v 1.5 2023-12-31 08:59:09+05:30 Cprogrammer Exp mbhangui $
#
pkgname=daemontools
pkgver=@version@
pkgrel=@release@
pkgdesc="Tools to manage Unix Services"
arch=('i686' 'x86_64')
url="https://github.com/mbhangui/indimail-mta"
url="https://github.com/indimail/indimail-mta"
license=('GPL3')
groups=('base-devel')
depends=('coreutils' 'findutils' 'sed' 'mariadb-libs' 'libqmail')
@@ -70,7 +73,7 @@ package() {
echo "Description=\"Daemontools\""
echo "daemontools_version=${pkgver}-${pkgrel}"
echo "ID=${pkgname}"
echo "HOME_URL=\"https://github.com/mbhangui/indimail-mta\""
echo "HOME_URL=\"https://github.com/indimail/indimail-mta\""
echo "PACKAGE_BUGREPORT=\"'@email@'\""
) > ${pkgname}-release
install -Dm 0644 ${pkgname}-release "$pkgdir""${_sysconfdir}"/${pkgname}-release
6 changes: 3 additions & 3 deletions daemontools-x/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# daemontools - collection of tools for managing UNIX services

This is a significant rewrite of [daemontools](https://cr.yp.to/daemontools.html) written by djb. This version of daaemontools is part of the [indimail-mta](https://github.com/mbhangui/indimail-mta), but can be used independently.
This is a significant rewrite of [daemontools](https://cr.yp.to/daemontools.html) written by djb. This version of daaemontools is part of the [indimail-mta](https://github.com/indimail/indimail-mta), but can be used independently.

Few of the changes are

@@ -25,7 +25,7 @@ Few of the changes are
19. functional as init replacement in docker/podman environment.
20. ability to become session leader if SETSID env variable is set
21. create .svscan.pid file
22. Linked with [libqmail](https://github.com/mbhangui/libqmail) to avoid duplication of functions and ease of maintenance. This also implies use of substdio interface instead of buffer interface for standard input / output
22. Linked with [libqmail](https://github.com/indimail/libqmail) to avoid duplication of functions and ease of maintenance. This also implies use of substdio interface instead of buffer interface for standard input / output

## Build daemontools

@@ -64,4 +64,4 @@ $ sudo make install or sudo ./qmake install

(check version in indimail-mta/daemontools-x/conf-version)

For more details look at [README](https://github.com/mbhangui/indimail-mta/blob/master/README.md)
For more details look at [README](https://github.com/indimail/indimail-mta/blob/master/README.md)
8 changes: 4 additions & 4 deletions daemontools-x/daemontools.spec.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# $Id: daemontools.spec.in,v 1.41 2023-12-29 23:07:13+05:30 Cprogrammer Exp mbhangui $
# $Id: daemontools.spec.in,v 1.42 2023-12-31 08:59:05+05:30 Cprogrammer Exp mbhangui $
%undefine _missing_build_ids_terminate_build
%global _unpackaged_files_terminate_build 1

@@ -26,7 +26,7 @@
%global qsysconfdir @sysconfdir@
%global logdir @logdir@
%global servicedir @servicedir@
%global see_base For a description of IndiMail visit https://github.com/mbhangui/indimail-mta
%global see_base For a description of IndiMail visit https://github.com/indimail/indimail-mta

%if %build_on_obs == 1
%global packager Manvendra Bhangui <@email@>
@@ -58,7 +58,7 @@ Group: System Environment/Base
Group: Productivity/Networking/Email/Servers
%endif
Source0: http://downloads.sourceforge.net/indimail/%{name}-%{version}.tar.gz
URL: https://github.com/mbhangui/indimail-mta
URL: https://github.com/indimail/indimail-mta

AutoReq: Yes
Conflicts: indimail-mta < 2.12
@@ -147,7 +147,7 @@ echo "NAME=%{name}"
echo "Description=\"Daemontools\""
echo "daemontools_version="%{version}""
echo "ID=%{name}"
echo "HOME_URL=\"https://github.com/mbhangui/indimail-mta\""
echo "HOME_URL=\"https://github.com/indimail/indimail-mta\""
echo "PACKAGE_BUGREPORT=\"'@email@'\""
) > %{name}-release

2 changes: 1 addition & 1 deletion daemontools-x/debian/control.in
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: @email@
Standards-Version: 3.9.1
Build-Depends: cdbs, debhelper (>= 9), gcc, automake, libqmail-dev, m4, gawk
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta

Package: daemontools
Architecture: any
2 changes: 1 addition & 1 deletion daemontools-x/debian/copyright.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
Name: IndiMail
Maintainer: @email@
Source: https://github.com/mbhangui/indimail-mta
Source: https://github.com/indimail/indimail-mta

Copyright: 2008-2020, Manvendra Bhangui <mbhangui@gmail.com>
License: GPL-3+
2 changes: 1 addition & 1 deletion daemontools-x/debian/daemontools-Debian_8.0.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: daemontools
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: daemontools-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion daemontools-x/debian/daemontools-xUbuntu_16.04.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: daemontools
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: daemontools-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion daemontools-x/debian/daemontools.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: daemontools
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: daemontools-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion daemontools-x/debian/rules.in
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ build-stamp:
echo Description=\"daemontools\"; \
echo daemontools_version=$(version); \
echo ID=daemontools; \
echo HOME_URL="https://github.com/mbhangui/indimail-mta"; \
echo HOME_URL="https://github.com/indimail/indimail-mta"; \
echo PACKAGE_BUGREPORT=\"'@email@'\"; \
) > daemontools-release
touch build-stamp
2 changes: 1 addition & 1 deletion daemontools-x/runpod.1
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ execute indimail containers. indimail containers can be downloaded from
.nf
https://hub.docker.com/u/cprogrammer
or
https://github.com/mbhangui?tab=packages
https://github.com/orgs/indimail/packages
.fi

\fIprog\fR is usually the binary to be executed on startup. \fIprog\fR also
7 changes: 5 additions & 2 deletions indimail-mta-x/PKGBUILD.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Maintainer: @email@
#
# $Log: PKGBUILD.in,v $
# Revision 1.21 2023-12-31 08:57:31+05:30 Cprogrammer
# moved repository to indimail org
#
# Revision 1.20 2023-07-07 20:50:59+05:30 Cprogrammer
# libdkim renamed to libdkim2
#
@@ -63,14 +66,14 @@
# Initial revision
#
#
# $Id: PKGBUILD.in,v 1.20 2023-07-07 20:50:59+05:30 Cprogrammer Exp mbhangui $
# $Id: PKGBUILD.in,v 1.21 2023-12-31 08:57:31+05:30 Cprogrammer Exp mbhangui $
#
pkgname=('indimail-mta' 'indimail-mini' 'qmta')
pkgver=@version@
pkgrel=@release@
pkgdesc="MTA for IndiMail virtualdomains"
arch=('i686' 'x86_64')
url="https://github.com/mbhangui/indimail-mta"
url="https://github.com/indimail/indimail-mta"
license=('GPL3')
groups=('base-devel')
makedepends=('pkgconfig' 'findutils' 'sed' 'openssl' 'libidn2' 'mariadb-libs' 'libqmail' 'libdkim2' 'libsrs2' 'libldap' 'gsasl' 'gzip')
4 changes: 2 additions & 2 deletions indimail-mta-x/SCRAM.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Add SCRAM support in indimail-ta
https://github.com/mbhangui/indimail-mta/issues/30
Add SCRAM support in indimail-mta
https://github.com/indimail/indimail-mta/issues/30
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/control.in
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: @email@
Standards-Version: 3.9.5
Build-Depends: cdbs, debhelper (>= 9), gcc, g++, binutils, automake, libdkim2-dev, libsrs2-dev, libqmail-dev, libldap2-dev, libssl-dev, mime-support, m4, gawk
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta

Package: indimail-mta
Architecture: any
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/copyright.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
Name: IndiMail
Maintainer: @email@
Source: https://github.com/mbhangui/indimail-mta
Source: https://github.com/indimail/indimail-mta

Copyright: 2008-2020, Manvendra Bhangui <mbhangui@gmail.com>
License: GPL-3+
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta-Debian_11.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta-Debian_12.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta-xUbuntu_16.04.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta-xUbuntu_18.04.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta-xUbuntu_21.04.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta-xUbuntu_21.10.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta-xUbuntu_22.04.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta-xUbuntu_23.04.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
2 changes: 1 addition & 1 deletion indimail-mta-x/debian/indimail-mta.dsc.in
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Binary: indimail-mta
Architecture: any
Version: @version@-@release@
Maintainer: @email@
Homepage: https://github.com/mbhangui/indimail-mta
Homepage: https://github.com/indimail/indimail-mta
Debtransform-Release: 1
Debtransform-Tar: indimail-mta-@version@.tar.gz
Debtransform-Files-Tar: debian.tar.gz
4 changes: 4 additions & 0 deletions indimail-mta-x/doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -149,6 +149,10 @@ o - New program printass to print entries in users/cdb, users/assign file
83. qlocal_upgrade: fixed copying cron config
- 30/12/2023
84. qmail-send.c, slowq-send.c: return from exit_todo if flagtodoalive is 0
- 31/12/2023
85. smtpd.c, PKGBUILD.in, indimail-mta.spec.in: moved repository to indimail
org
86. qmail-showctl.c: updated control file list

* Tue Oct 17 2023 18:34:04 +0000 Manvendra Bhangui <indimail-mta@indimail.org> 3.0.5-1.1%{?dist}
Release 3.0.5-1.1 Start 11/09/2023 End 17/10/2023
2 changes: 1 addition & 1 deletion indimail-mta-x/doc/README.filters
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
This document has moved to

https://github.com/mbhangui/indimail-mta/wiki/IndiMail#writing-filters-for-indimail
https://github.com/indimail/indimail-mta/wiki/IndiMail#writing-filters-for-indimail
2 changes: 1 addition & 1 deletion indimail-mta-x/indimail-mta-release.in
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@ NAME=indimail-mta
Description="IndiMail MTA"
MTA_version=@version@
ID=indimail-mta
HOME_URL="https://github.com/mbhangui/indimail-mta"
HOME_URL="https://github.com/indimail/indimail-mta"
PACKAGE_BUGREPORT="'@email@'"
6 changes: 3 additions & 3 deletions indimail-mta-x/indimail-mta.spec.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# $Id: indimail-mta.spec.in,v 1.395 2023-12-24 23:54:33+05:30 Cprogrammer Exp mbhangui $
# $Id: indimail-mta.spec.in,v 1.396 2023-12-31 08:56:58+05:30 Cprogrammer Exp mbhangui $
%undefine _missing_build_ids_terminate_build
%global _unpackaged_files_terminate_build 1

@@ -27,7 +27,7 @@
%global servicedir @servicedir@
%global plugindir %{_prefix}/lib/indimail/plugins
%global tcpserver_plugin 1
%global see_base For a description of IndiMail visit https://github.com/mbhangui/indimail-mta
%global see_base For a description of IndiMail visit https://github.com/indimail/indimail-mta
%global nodksignatures 0
%global notlsarr 0

@@ -107,7 +107,7 @@ Source3: http://downloads.sourceforge.net/indimail/%{name}-permissions.secure
Source4: http://downloads.sourceforge.net/indimail/%{name}-permissions.paranoid
%endif

URL: https://github.com/mbhangui/indimail-mta
URL: https://github.com/indimail/indimail-mta
AutoReq: Yes
Conflicts: indimail-mini
Conflicts: qmta
2 changes: 1 addition & 1 deletion indimail-mta-x/qmail-perf/README.md
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ The qmail-perf-test script will create a csv file with the data and averaged tot
* VERSION (Workstation Edition)
* Software
* daemontools from openSUSE [Build Service Repo](https://software.opensuse.org//download.html?project=home%3Ambhangui&package=daemontools)
* indimail-mta (dynamic-queue branch) from source [indimail-mta](https://github.com/mbhangui/indimail-mta). This included qmailanalog program/scripts matchup and zoverall used by the qmail-perf-test script.
* indimail-mta (dynamic-queue branch) from source [indimail-mta](https://github.com/indimail/indimail-mta). This included qmailanalog program/scripts matchup and zoverall used by the qmail-perf-test script.
* netqmail from source [netqmail](http://netqmail.org/)
* netqmail-exttodo from [netqmail source](http://netqmail.org) + [exttodo patch](https://github.com/bruceg/qmail-patches/blob/master/ext_todo-20030105.patch)
* notqmail from source [notqmail](https://github.com/notqmail/notqmail)
4 changes: 2 additions & 2 deletions indimail-mta-x/qmail-perf/qmail-perf-test
Original file line number Diff line number Diff line change
@@ -49,11 +49,11 @@ WARNING!!! You cannot run this program as root
This scripts expects the following
1. daemontools installed from
https://github.com/mbhangui/indimail-mta/tree/master/daemontools-x
https://github.com/indimail/indimail-mta/tree/master/daemontools-x
or rpm from
https://software.opensuse.org//download.html?project=home%3Ambhangui&package=daemontools
2. standard indimail-mta installation from
https://github.com/mbhangui/indimail-mta/tree/master/indimail-mta-x
https://github.com/indimail/indimail-mta/tree/master/indimail-mta-x
or rpm from
https://software.opensuse.org//download.html?project=home%3Ambhangui&package=indimail-mta
3. netqmail installed in /var/netqmail with logs in /var/log/svc/netqmail
2 changes: 1 addition & 1 deletion indimail-mta-x/qmail-smtpd.9
Original file line number Diff line number Diff line change
@@ -1791,7 +1791,7 @@ See rfc-1893(5) for an explanation of the error codes in parentheses.
"557 sorry, too many recipients (#5.7.1)"
.SH "SEE ALSO"
https://github.com/mbhangui/indimail-mta/wiki/0-IndiMail-Wiki,
https://github.com/indimail/indimail-mta/wiki/0-IndiMail-Wiki,
mysqld(1), tcp-env(1), tcp-environ(5), tcpserver(1), tcprules(1), uacl(1),
indimail-control(5), MCDFILE(5), qmail-inject(8), qmail-cdb(8),
qmail-queue(8), qmail-multi(8), qscanq(8), cleanq(8), qmail-remote(8),
Loading

0 comments on commit c60f3c6

Please sign in to comment.