debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://notmuchmail.org/git/notmuch

Browse source
This commit is contained in:
Sebastian Spaeth 2011-09-05 15:53:45 +02:00
commit 09c0804c2d
4 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile.local
View file

@ -34,6 +34,8 @@ DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz
SHA1_FILE=$(TAR_FILE).sha1 SHA1_FILE=$(TAR_FILE).sha1
GPG_FILE=$(SHA1_FILE).asc GPG_FILE=$(SHA1_FILE).asc
PV_FILE=bindings/python/notmuch/version.py
# Smash together user's values with our extra values # Smash together user's values with our extra values
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
@ -166,7 +168,7 @@ release-message:
verify-source-tree-and-version: verify-no-dirty-code verify-source-tree-and-version: verify-no-dirty-code
.PHONY: verify-no-dirty-code .PHONY: verify-no-dirty-code
verify-no-dirty-code: verify-version-debian verify-no-dirty-code: verify-version-debian verify-version-python
ifeq ($(IS_GIT),yes) ifeq ($(IS_GIT),yes)
@printf "Checking that source tree is clean..." @printf "Checking that source tree is clean..."
ifneq ($(shell git ls-files -m),) ifneq ($(shell git ls-files -m),)
@ -192,6 +194,15 @@ verify-version-debian: verify-version-components
fi fi
@echo "Good." @echo "Good."
.PHONY: verify-version-python
verify-version-python: verify-version-components
@echo -n "Checking that python bindings version is $(VERSION)..."
@if [ "$(VERSION)" != $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] ; then \
(echo "No." && \
echo "Please edit version and $(PV_FILE) to have consistent versions." && false) \
fi
@echo "Good."
.PHONY: verify-version-components .PHONY: verify-version-components
verify-version-components: verify-version-components:
@echo -n "Checking that $(VERSION) consists only of digits and periods..." @echo -n "Checking that $(VERSION) consists only of digits and periods..."

2
emacs/notmuch-mua.el
View file

@ -65,7 +65,7 @@ list."
(defun notmuch-mua-add-more-hidden-headers () (defun notmuch-mua-add-more-hidden-headers ()
"Add some headers to the list that are hidden by default." "Add some headers to the list that are hidden by default."
(mapc (lambda (header) (mapc (lambda (header)
(when (not (member header 'message-hidden-headers)) (when (not (member header message-hidden-headers))
(push header message-hidden-headers))) (push header message-hidden-headers)))
notmuch-mua-hidden-headers)) notmuch-mua-hidden-headers))

3
lib/gen-version-script.sh
View file

@ -12,7 +12,7 @@ HEADER=$1
shift shift
printf '{\nglobal:\n' printf '{\nglobal:\n'
nm --defined $* | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \ nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \
while read sym; do while read sym; do
demangled=$(c++filt $sym) demangled=$(c++filt $sym)
case $demangled in case $demangled in
@ -23,5 +23,6 @@ while read sym; do
;; ;;
esac esac
done done
nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $2 == "T" && $3 ~ "^get(line|delim)$" {print $3 ";"}'
sed -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/ \1;/p' $HEADER sed -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/ \1;/p' $HEADER
printf "local: *;\n};\n" printf "local: *;\n};\n"

29
test/multipart
View file

@ -6,7 +6,7 @@ cat <<EOF > ${MAIL_DIR}/multipart
From: Carl Worth <cworth@cworth.org> From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org To: cworth@cworth.org
Subject: Multipart message Subject: Multipart message
Date: Tue, 05 Jan 2001 15:43:57 -0000 Date: Fri, 05 Jan 2001 15:43:57 +0000
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu)
Message-ID: <87liy5ap00.fsf@yoom.home.cworth.org> Message-ID: <87liy5ap00.fsf@yoom.home.cworth.org>
MIME-Version: 1.0 MIME-Version: 1.0
@ -23,7 +23,7 @@ Content-Disposition: inline
From: Carl Worth <cworth@cworth.org> From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org To: cworth@cworth.org
Subject: html message Subject: html message
Date: Tue, 05 Jan 2001 15:42:57 -0000 Date: Fri, 05 Jan 2001 15:42:57 +0000
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu)
Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org> Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org>
MIME-Version: 1.0 MIME-Version: 1.0
@ -61,7 +61,7 @@ cat <<EOF > ${MAIL_DIR}/base64-part-with-crlf
From: Carl Worth <cworth@cworth.org> From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org To: cworth@cworth.org
Subject: Test message with a BASE64 encoded binary containing CRLF pair Subject: Test message with a BASE64 encoded binary containing CRLF pair
Date: Tue, 05 Jan 2001 15:43:57 -0000 Date: Fri, 05 Jan 2001 15:43:57 +0000
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu)
Message-ID: <base64-part-with-crlf> Message-ID: <base64-part-with-crlf>
MIME-Version: 1.0 MIME-Version: 1.0
@ -99,7 +99,7 @@ Carl Worth <cworth@cworth.org> (2001-01-05) (attachment inbox signed unread)
Subject: Multipart message Subject: Multipart message
From: Carl Worth <cworth@cworth.org> From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org To: cworth@cworth.org
Date: Tue, 05 Jan 2001 15:43:57 -0000 Date: Fri, 05 Jan 2001 15:43:57 +0000
header} header}
body{ body{
part{ ID: 1, Content-type: multipart/signed part{ ID: 1, Content-type: multipart/signed
@ -127,18 +127,9 @@ Non-text part: application/pgp-signature
EOF EOF
test_expect_equal_file OUTPUT EXPECTED test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest "--format=text --part=0, full message" test_begin_subtest "--format=text --part=1, message body"
notmuch show --format=text --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT notmuch show --format=text --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
cat <<EOF >EXPECTED cat <<EOF >EXPECTED
message{ id:87liy5ap00.fsf@yoom.home.cworth.org depth:0 match:1 filename:${MAIL_DIR}/multipart
header{
Carl Worth <cworth@cworth.org> (2001-01-05) (attachment inbox signed unread)
Subject: Multipart message
From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org
Date: Tue, 05 Jan 2001 15:43:57 -0000
header}
body{
part{ ID: 1, Content-type: multipart/signed part{ ID: 1, Content-type: multipart/signed
part{ ID: 2, Content-type: multipart/mixed part{ ID: 2, Content-type: multipart/mixed
part{ ID: 3, Content-type: message/rfc822 part{ ID: 3, Content-type: message/rfc822
@ -159,8 +150,6 @@ And this message is signed.
Non-text part: application/pgp-signature Non-text part: application/pgp-signature
part} part}
part} part}
body}
message}
EOF EOF
test_expect_equal_file OUTPUT EXPECTED test_expect_equal_file OUTPUT EXPECTED
@ -241,7 +230,7 @@ test_expect_success \
test_begin_subtest "--format=json --part=0, full message" test_begin_subtest "--format=json --part=0, full message"
output=$(notmuch show --format=json --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org') output=$(notmuch show --format=json --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org')
test_expect_equal "$output" \ test_expect_equal "$output" \
'{"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "'"${MAIL_DIR}/multipart"'", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Tue, 05 Jan 2001 15:43:57 -0000"}, "body": [{"id": 1, "content-type": "multipart/signed", "content": [{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}, {"id": 7, "content-type": "application/pgp-signature"}]}]}' '{"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "'"${MAIL_DIR}/multipart"'", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, "body": [{"id": 1, "content-type": "multipart/signed", "content": [{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}, {"id": 7, "content-type": "application/pgp-signature"}]}]}'
test_begin_subtest "--format=json --part=1, message body" test_begin_subtest "--format=json --part=1, message body"
output=$(notmuch show --format=json --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org') output=$(notmuch show --format=json --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org')
@ -252,13 +241,11 @@ test_begin_subtest "--format=json --part=2, multipart/mixed"
output=$(notmuch show --format=json --part=2 'id:87liy5ap00.fsf@yoom.home.cworth.org') output=$(notmuch show --format=json --part=2 'id:87liy5ap00.fsf@yoom.home.cworth.org')
test_expect_equal "$output" \ test_expect_equal "$output" \
'{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}' '{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}'
test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest "--format=json --part=3, rfc822 multipart" test_begin_subtest "--format=json --part=3, rfc822 multipart"
output=$(notmuch show --format=json --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org') output=$(notmuch show --format=json --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org')
test_expect_equal "$output" \ test_expect_equal "$output" \
'{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}' '{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}'
test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest "--format=json --part=4, html part" test_begin_subtest "--format=json --part=4, html part"
output=$(notmuch show --format=json --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org') output=$(notmuch show --format=json --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org')
@ -393,7 +380,7 @@ To: Carl Worth <cworth@cworth.org>, cworth@cworth.org
In-Reply-To: <87liy5ap00.fsf@yoom.home.cworth.org> In-Reply-To: <87liy5ap00.fsf@yoom.home.cworth.org>
References: <87liy5ap00.fsf@yoom.home.cworth.org> References: <87liy5ap00.fsf@yoom.home.cworth.org>
On Tue, 05 Jan 2001 15:43:57 -0000, Carl Worth <cworth@cworth.org> wrote: On Fri, 05 Jan 2001 15:43:57 +0000, Carl Worth <cworth@cworth.org> wrote:
Non-text part: multipart/signed Non-text part: multipart/signed
Non-text part: multipart/mixed Non-text part: multipart/mixed
Non-text part: message/rfc822 Non-text part: message/rfc822